diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 15:53:51 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-13 22:09:41 +0300 |
| commit | 8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e (patch) | |
| tree | 8bab721107fae818dad896a0876d50d3d0a0d981 /pkgs/applications/misc/guake | |
| parent | e26119619f7ce64b065e692ba0cd31f53b9ef637 (diff) | |
replace makeSearchPath tree-wise to take care of possible multiple outputs
Diffstat (limited to 'pkgs/applications/misc/guake')
| -rw-r--r-- | pkgs/applications/misc/guake/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 4f6733e7d8de..81ac845c5cf8 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -16,8 +16,7 @@ gconftool-2 --recursive-unset /apps/guake with lib; let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ]; - pySubDir = "lib/${python2.libPrefix}/site-packages"; - pyPath = makeSearchPath pySubDir (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); + pyPath = makeSearchPathOutputs python2.sitePackages ["lib"] (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); in stdenv.mkDerivation rec { name = "guake-${version}"; version = "0.8.3"; @@ -63,7 +62,7 @@ let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_co wrapProgram $bin \ --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \ - --prefix PYTHONPATH : "$out/${pySubDir}:${pyPath}:$PYTHONPATH" + --prefix PYTHONPATH : "$out/${python2.sitePackages}:${pyPath}:$PYTHONPATH" done ''; |