Browse Source

makeSearchPathOutputs: refactor to makeSearchPathOutput

nixos-19.03
Nikolay Amiantov 6 years ago
parent
commit
ab0a0c004e
  1. 9
      lib/strings.nix
  2. 2
      nixos/modules/services/web-servers/apache-httpd/trac.nix
  3. 2
      nixos/modules/services/x11/desktop-managers/enlightenment.nix
  4. 2
      nixos/modules/system/boot/loader/grub/grub.nix
  5. 2
      nixos/modules/system/boot/systemd-unit-options.nix
  6. 2
      pkgs/applications/misc/guake/default.nix
  7. 2
      pkgs/applications/misc/roxterm/default.nix
  8. 2
      pkgs/applications/networking/browsers/chromium/plugins.nix
  9. 2
      pkgs/applications/networking/browsers/firefox-bin/default.nix
  10. 2
      pkgs/applications/networking/browsers/google-chrome/default.nix
  11. 2
      pkgs/applications/networking/browsers/opera/default.nix
  12. 2
      pkgs/applications/networking/browsers/vivaldi/default.nix
  13. 2
      pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
  14. 2
      pkgs/applications/science/math/mathematica/9.nix
  15. 2
      pkgs/applications/science/math/mathematica/default.nix
  16. 2
      pkgs/applications/version-management/reposurgeon/default.nix
  17. 2
      pkgs/games/ue4demos/default.nix
  18. 2
      pkgs/os-specific/linux/pm-utils/default.nix

9
lib/strings.nix

@ -88,15 +88,14 @@ rec {
makeSearchPath = subDir: packages:
concatStringsSep ":" (map (path: path + "/" + subDir) packages);
/* Construct a Unix-style search path, given trying outputs in order.
/* Construct a Unix-style search path, using given package output.
If no output is found, fallback to `.out` and then to the default.
Example:
makeSearchPathOutputs "bin" ["bin"] [ pkgs.openssl pkgs.zlib ]
=> "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-bin/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin"
makeSearchPathOutput "dev" "bin" [ pkgs.openssl pkgs.zlib ]
=> "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin"
*/
makeSearchPathOutputs = subDir: outputs: pkgs:
makeSearchPath subDir (map (pkg: if pkg.outputUnspecified or false then lib.tryAttrs (outputs ++ ["out"]) pkg else pkg) pkgs);
makeSearchPathOutput = output: subDir: pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs);
/* Construct a library search path (such as RPATH) containing the
libraries for a set of packages

2
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

2
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

2
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
]);
});

2
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>

2
pkgs/applications/misc/guake/default.nix

@ -16,7 +16,7 @@ gconftool-2 --recursive-unset /apps/guake
with lib;
let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ];
pyPath = makeSearchPathOutputs python2.sitePackages ["lib"] (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);
pyPath = makeSearchPathOutput "lib" python2.sitePackages (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);
in stdenv.mkDerivation rec {
name = "guake-${version}";
version = "0.8.3";

2
pkgs/applications/misc/roxterm/default.nix

@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
"-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
# Fix up python path so the lockfile library is on it.
PYTHONPATH = stdenv.lib.makeSearchPathOutputs pythonFull.sitePackages ["lib"] [
PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" pythonFull.sitePackages [
pythonPackages.curses pythonPackages.lockfile
];

2
pkgs/applications/networking/browsers/chromium/plugins.nix

@ -65,7 +65,7 @@ let
patchPhase = let
rpaths = [ stdenv.cc.cc ];
mkrpath = p: "${makeSearchPathOutputs "lib64" ["lib"] p}:${makeLibraryPath p}";
mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}";
in ''
for sofile in PepperFlash/libpepflashplayer.so \
libwidevinecdm.so libwidevinecdmadapter.so; do

2
pkgs/applications/networking/browsers/firefox-bin/default.nix

@ -105,7 +105,7 @@ stdenv.mkDerivation {
libheimdal
libpulseaudio
systemd
] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [
] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
stdenv.cc.cc
];

2
pkgs/applications/networking/browsers/google-chrome/default.nix

@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
tar xf data.tar.xz
'';
rpath = makeLibraryPath deps + ":" + makeSearchPathOutputs "lib64" ["lib"] deps;
rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps;
binpath = makeBinPath deps;
installPhase = ''

2
pkgs/applications/networking/browsers/opera/default.nix

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
(":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
(":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
preFixup =
''

2
pkgs/applications/networking/browsers/vivaldi/default.nix

@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
(":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
(":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
buildPhase = ''
echo "Patching Vivaldi binaries"

2
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix

@ -105,7 +105,7 @@ stdenv.mkDerivation {
nspr
nss
pango
] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [
] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
stdenv.cc.cc
];

2
pkgs/applications/science/math/mathematica/9.nix

@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
ldpath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
(":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
(":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
phases = "unpackPhase installPhase fixupPhase";

2
pkgs/applications/science/math/mathematica/default.nix

@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
ldpath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
(":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
(":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
phases = "unpackPhase installPhase fixupPhase";

2
pkgs/applications/version-management/reposurgeon/default.nix

@ -51,7 +51,7 @@ mkDerivation rec {
[ out git bazaar cvs darcs fossil mercurial
monotone rcs src subversion cvs_fast_export ]
);
pythonpath = makeSearchPathOutputs python27.sitePackages ["lib"] (
pythonpath = makeSearchPathOutput "lib" python27.sitePackages (
filter (x: x != null)
[ python27Packages.readline or null python27Packages.hglib or null ]
);

2
pkgs/games/ue4demos/default.nix

@ -12,7 +12,7 @@ let
rtdeps = stdenv.lib.makeLibraryPath
[ xorg.libXxf86vm xorg.libXext openal ]
+ ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [ stdenv.cc.cc ];
+ ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
buildCommand =
''

2
pkgs/os-specific/linux/pm-utils/default.nix

@ -6,7 +6,7 @@ let
binPath = stdenv.lib.makeBinPath
[ coreutils gnugrep utillinux kmod procps kbd dbus_tools ];
sbinPath = stdenv.lib.makeSearchPathOutputs "sbin" ["bin"]
sbinPath = stdenv.lib.makeSearchPathOutput "bin" "sbin"
[ procps ];
in

Loading…
Cancel
Save