Merge branch 'master' into core-updates-frozen

[jackhill/guix/guix.git] / gnu / packages / xfce.scm

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 7e62fab..b613362 100644 (file)
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -255,7 +255,7 @@ to share commonly used Xfce widgets among the Xfce applications.")
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
                (wrap-program (string-append out "/bin/catfish")
-                 `("PYTHONPATH" = (,(getenv "PYTHONPATH")))
+                 `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
                  `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))
        #:tests? #f))
     (native-inputs
@@ -436,8 +436,7 @@ management D-Bus specification.")
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* (string-append "plugins/clock/clock.c")
                (("/usr/share/zoneinfo")
-                (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")))
-             #t)))))
+                (search-input-directory inputs "share/zoneinfo"))))))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)