diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-04-14 18:14:28 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-25 13:24:39 +0300 |
commit | ab0a0c004e1076315c8ed910437e6cf9c2f087ff (patch) | |
tree | 07b55b8caf43faf9803d80e3e71b90ed226a9bd2 /nixos | |
parent | 7d3e75827bc20d50a3b9172ed8891e5bffb30c93 (diff) | |
download | nixpkgs-ab0a0c004e1076315c8ed910437e6cf9c2f087ff.tar nixpkgs-ab0a0c004e1076315c8ed910437e6cf9c2f087ff.tar.gz nixpkgs-ab0a0c004e1076315c8ed910437e6cf9c2f087ff.tar.bz2 nixpkgs-ab0a0c004e1076315c8ed910437e6cf9c2f087ff.tar.lz nixpkgs-ab0a0c004e1076315c8ed910437e6cf9c2f087ff.tar.xz nixpkgs-ab0a0c004e1076315c8ed910437e6cf9c2f087ff.tar.zst nixpkgs-ab0a0c004e1076315c8ed910437e6cf9c2f087ff.zip |
makeSearchPathOutputs: refactor to makeSearchPathOutput
Diffstat (limited to 'nixos')
4 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix index c4aa6b6ad3a..3196edc2838 100644 --- a/nixos/modules/services/web-servers/apache-httpd/trac.nix +++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix @@ -96,7 +96,7 @@ in globalEnvVars = singleton { name = "PYTHONPATH"; value = - makeSearchPathOutputs "lib/${pkgs.python.libPrefix}/site-packages" ["lib"] + makeSearchPathOutput "lib" "lib/${pkgs.python.libPrefix}/site-packages" [ pkgs.mod_python pkgs.pythonPackages.trac pkgs.setuptools diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 11df7297833..2e788d86960 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -7,7 +7,7 @@ let e = pkgs.enlightenment; xcfg = config.services.xserver; cfg = xcfg.desktopManager.enlightenment; - GST_PLUGIN_PATH = lib.makeSearchPathOutputs "lib/gstreamer-1.0" ["lib"] [ + GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [ pkgs.gst_all_1.gst-plugins-base pkgs.gst_all_1.gst-plugins-good pkgs.gst_all_1.gst-plugins-bad diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 289405f9319..7fc467b60f7 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -58,7 +58,7 @@ let path = (makeBinPath ([ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else []) - )) + ":" + (makeSearchPathOutputs "sbin" ["bin"] [ + )) + ":" + (makeSearchPathOutput "bin" "sbin" [ pkgs.mdadm pkgs.utillinux ]); }); diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index c8c9cda913c..f2a22e4ada8 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -193,7 +193,7 @@ in rec { path = mkOption { default = []; - apply = ps: "${makeBinPath ps}:${makeSearchPathOutputs "sbin" ["bin"] ps}"; + apply = ps: "${makeBinPath ps}:${makeSearchPathOutput "bin" "sbin" ps}"; description = '' Packages added to the service's <envar>PATH</envar> environment variable. Both the <filename>bin</filename> |