commit 8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e · pyrox.dev/nixpkgs

+1 -1

nixos/modules/services/misc/octoprint.nix

···

       102
       102
        
             wantedBy = [ "multi-user.target" ];

     

       103
       103
        
             after = [ "network.target" ];

     

       104
       104
        
             path = [ pluginsEnv ];

     

       105
       105
       -
             environment.PYTHONPATH = makeSearchPath pkgs.python.sitePackages [ pluginsEnv ];

     

       105
       105
       +
             environment.PYTHONPATH = makeSearchPathOutputs pkgs.python.sitePackages ["lib"] [ pluginsEnv ];

     

       106
       106
        
       

     

       107
       107
        
             preStart = ''

     

       108
       108
        
               mkdir -p "${cfg.stateDir}"

+1 -1

nixos/modules/services/web-servers/apache-httpd/trac.nix

···

       96
       96
        
         globalEnvVars = singleton

     

       97
       97
        
           { name = "PYTHONPATH";

     

       98
       98
        
             value =

     

       99
       99
       -
               makeSearchPath "lib/${pkgs.python.libPrefix}/site-packages"

     

       99
       99
       +
               makeSearchPathOutputs "lib/${pkgs.python.libPrefix}/site-packages" ["lib"]

     

       100
       100
        
                 [ pkgs.mod_python

     

       101
       101
        
                   pkgs.pythonPackages.trac

     

       102
       102
        
                   pkgs.setuptools

+1 -1

nixos/modules/services/x11/desktop-managers/enlightenment.nix

···

       7
       7
        
         e = pkgs.enlightenment;

     

       8
       8
        
         xcfg = config.services.xserver;

     

       9
       9
        
         cfg = xcfg.desktopManager.enlightenment;

     

       10
       10
       -
         GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [

     

       10
       10
       +
         GST_PLUGIN_PATH = lib.makeSearchPathOutputs "lib/gstreamer-1.0" ["lib"] [

     

       11
       11
        
           pkgs.gst_all_1.gst-plugins-base

     

       12
       12
        
           pkgs.gst_all_1.gst-plugins-good

     

       13
       13
        
           pkgs.gst_all_1.gst-plugins-bad

+2 -2

nixos/modules/system/boot/loader/grub/grub.nix

···

       55
       55
        
               version extraConfig extraPerEntryConfig extraEntries

     

       56
       56
        
               extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout

     

       57
       57
        
               default fsIdentifier efiSupport gfxmodeEfi gfxmodeBios;

     

       58
       58
       -
             path = (makeSearchPath "bin" ([

     

       58
       58
       +
             path = (makeBinPath ([

     

       59
       59
        
               pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs

     

       60
       60
        
               pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else [])

     

       61
       61
       -
             )) + ":" + (makeSearchPath "sbin" [

     

       61
       61
       +
             )) + ":" + (makeSearchPathOutputs "sbin" ["bin"] [

     

       62
       62
        
               pkgs.mdadm pkgs.utillinux

     

       63
       63
        
             ]);

     

       64
       64
        
           });

+1 -1

nixos/modules/system/boot/systemd-unit-options.nix

···

       193
       193
        
       

     

       194
       194
        
           path = mkOption {

     

       195
       195
        
             default = [];

     

       196
       196
       -
             apply = ps: "${makeSearchPath "bin" ps}:${makeSearchPath "sbin" ps}";

     

       196
       196
       +
             apply = ps: "${makeBinPath ps}:${makeSearchPathOutputs "sbin" ["bin"] ps}";

     

       197
       197
        
             description = ''

     

       198
       198
        
               Packages added to the service's <envar>PATH</envar>

     

       199
       199
        
               environment variable.  Both the <filename>bin</filename>

+1 -1

nixos/modules/virtualisation/azure-agent.nix

···

       42
       42
        
       

     

       43
       43
        
             wrapProgram "$out/bin/waagent" \

     

       44
       44
        
                 --prefix PYTHONPATH : $PYTHONPATH \

     

       45
       45
       -
                 --prefix PATH : "${makeSearchPath "bin" runtimeDeps}"

     

       45
       45
       +
                 --prefix PATH : "${makeBinPath runtimeDeps}"

     

       46
       46
        
           '';

     

       47
       47
        
         };

     

       48
       48

+1 -1

nixos/modules/virtualisation/virtualbox-guest.nix

···

       66
       66
        
       

     

       67
       67
        
           services.xserver.displayManager.sessionCommands =

     

       68
       68
        
             ''

     

       69
       69
       -
               PATH=${makeSearchPath "bin" [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver.out ]}:$PATH \

     

       69
       69
       +
               PATH=${makeBinPath [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver.out ]}:$PATH \

     

       70
       70
        
                 ${kernel.virtualboxGuestAdditions}/bin/VBoxClient-all

     

       71
       71
        
             '';

     

       72
       72

+2 -3

pkgs/applications/misc/guake/default.nix

···

       16
       16
        
       with lib;

     

       17
       17
        
       

     

       18
       18
        
       let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ];

     

       19
       19
       -
           pySubDir = "lib/${python2.libPrefix}/site-packages";

     

       20
       20
       -
           pyPath = makeSearchPath pySubDir (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);

     

       19
       19
       +
           pyPath = makeSearchPathOutputs python2.sitePackages ["lib"] (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);

     

       21
       20
        
        in stdenv.mkDerivation rec {

     

       22
       21
        
         name = "guake-${version}";

     

       23
       22
        
         version = "0.8.3";

     
···

       63
       62
        
             wrapProgram $bin \

     

       64
       63
        
               --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \

     

       65
       64
        
               --prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \

     

       66
       66
       -
               --prefix PYTHONPATH : "$out/${pySubDir}:${pyPath}:$PYTHONPATH"

     

       65
       65
       +
               --prefix PYTHONPATH : "$out/${python2.sitePackages}:${pyPath}:$PYTHONPATH"

     

       67
       66
        
           done

     

       68
       67
        
         '';

     

       69
       68

+1 -1

pkgs/applications/misc/playonlinux/default.nix

···

       26
       26
        
       let

     

       27
       27
        
         version = "4.2.9";

     

       28
       28
        
       

     

       29
       29
       -
         binpath = stdenv.lib.makeSearchPath "bin"

     

       29
       29
       +
         binpath = stdenv.lib.makeBinPath

     

       30
       30
        
           [ cabextract

     

       31
       31
        
             python2Packages.python

     

       32
       32
        
             gettext

+1 -1

pkgs/applications/misc/roxterm/default.nix

···

       29
       29
        
                                "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];

     

       30
       30
        
       

     

       31
       31
        
         # Fix up python path so the lockfile library is on it.

     

       32
       32
       -
         PYTHONPATH = stdenv.lib.makeSearchPath "lib/${pythonFull.libPrefix}/site-packages" [

     

       32
       32
       +
         PYTHONPATH = stdenv.lib.makeSearchPathOutputs pythonFull.sitePackages ["lib"] [

     

       33
       33
        
           pythonPackages.curses pythonPackages.lockfile

     

       34
       34
        
         ];

     

       35
       35

+1 -1

pkgs/applications/misc/zathura/default.nix

···

       30
       30
        
       

     

       31
       31
        
           name = "zathura-${zathura_core.version}";

     

       32
       32
        
       

     

       33
       33
       -
           plugins_path = stdenv.lib.makeSearchPath "lib" [

     

       33
       33
       +
           plugins_path = stdenv.lib.makeLibraryPath [

     

       34
       34
        
             zathura_djvu

     

       35
       35
        
             zathura_ps

     

       36
       36
        
             (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler)

+2 -2

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

···

       64
       64
        
           '';

     

       65
       65
        
       

     

       66
       66
        
           patchPhase = let

     

       67
       67
       -
             rpaths = [ stdenv.cc.cc.lib ];

     

       68
       68
       -
             mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}";

     

       67
       67
       +
             rpaths = [ stdenv.cc.cc ];

     

       68
       68
       +
             mkrpath = p: "${makeSearchPathOutputs "lib64" ["lib"] p}:${makeLibraryPath p}";

     

       69
       69
        
           in ''

     

       70
       70
        
             for sofile in PepperFlash/libpepflashplayer.so \

     

       71
       71
        
                           libwidevinecdm.so libwidevinecdmadapter.so; do

+1 -1

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

···

       105
       105
        
             libheimdal

     

       106
       106
        
             libpulseaudio

     

       107
       107
        
             systemd

     

       108
       108
       -
           ] + ":" + stdenv.lib.makeSearchPath "lib64" [

     

       108
       108
       +
           ] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [

     

       109
       109
        
             stdenv.cc.cc

     

       110
       110
        
           ];

     

       111
       111

+1 -1

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

···

       46
       46
        
       

     

       47
       47
        
         libPath = stdenv.lib.makeLibraryPath buildInputs

     

       48
       48
        
           + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")

     

       49
       49
       -
             (":" + stdenv.lib.makeSearchPath "lib64" buildInputs);

     

       49
       49
       +
             (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);

     

       50
       50
        
       

     

       51
       51
        
         preFixup =

     

       52
       52
        
           ''

+1 -1

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

···

       46
       46
        
       

     

       47
       47
        
         libPath = stdenv.lib.makeLibraryPath buildInputs

     

       48
       48
        
           + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")

     

       49
       49
       -
             (":" + stdenv.lib.makeSearchPath "lib64" buildInputs);

     

       49
       49
       +
             (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);

     

       50
       50
        
       

     

       51
       51
        
         buildPhase = ''

     

       52
       52
        
           echo "Patching Vivaldi binaries"

+1 -1

pkgs/applications/networking/dropbox/default.nix

···

       36
       36
        
         # relative location where the dropbox libraries are stored

     

       37
       37
        
         appdir = "opt/dropbox";

     

       38
       38
        
       

     

       39
       39
       -
         ldpath = stdenv.lib.makeSearchPath "lib"

     

       39
       39
       +
         ldpath = stdenv.lib.makeLibraryPath

     

       40
       40
        
           [

     

       41
       41
        
             dbus_libs gcc.cc glib libdrm libffi libICE libSM libX11 libXmu

     

       42
       42
        
             ncurses popt qtbase qtdeclarative qtwebkit zlib

+1 -1

pkgs/applications/networking/instant-messengers/hipchat/default.nix

···

       6
       6
        
       

     

       7
       7
        
         version = "4.0.1631";

     

       8
       8
        
       

     

       9
       9
       -
         rpath = stdenv.lib.makeSearchPath "lib" [

     

       9
       9
       +
         rpath = stdenv.lib.makeLibraryPath [

     

       10
       10
        
           xorg.libXext

     

       11
       11
        
           xorg.libSM

     

       12
       12
        
           xorg.libICE

+1 -1

pkgs/applications/networking/instant-messengers/slack/default.nix

···

       6
       6
        
       

     

       7
       7
        
         version = "2.0.3";

     

       8
       8
        
       

     

       9
       9
       -
         rpath = stdenv.lib.makeSearchPath "lib" [

     

       9
       9
       +
         rpath = stdenv.lib.makeLibraryPath [

     

       10
       10
        
           alsaLib

     

       11
       11
        
           atk

     

       12
       12
        
           cairo

+1 -1

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

···

       105
       105
        
             nspr

     

       106
       106
        
             nss

     

       107
       107
        
             pango

     

       108
       108
       -
           ] + ":" + stdenv.lib.makeSearchPath "lib64" [

     

       108
       108
       +
           ] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [

     

       109
       109
        
             stdenv.cc.cc

     

       110
       110
        
           ];

     

       111
       111

+1 -1

pkgs/applications/networking/spideroak/default.nix

···

       16
       16
        
           else if stdenv.system == "i686-linux" then "8c23271291f40aa144bbf38ceb3cc2a05bed00759c87a65bd798cf8bb289d07a"

     

       17
       17
        
           else throw "Spideroak client for: ${stdenv.system} not supported!";

     

       18
       18
        
       

     

       19
       19
       -
         ldpath = stdenv.lib.makeSearchPath "lib" [

     

       19
       19
       +
         ldpath = stdenv.lib.makeLibraryPath [

     

       20
       20
        
           glib fontconfig libXext libX11 freetype libXrender

     

       21
       21
        
         ];

     

       22
       22

+2 -2

pkgs/applications/science/machine-learning/torch/torch-distro.nix

···

       73
       73
        
       

     

       74
       74
        
                 for p in $out/bin/*; do

     

       75
       75
        
                   wrapProgram $p \

     

       76
       76
       -
                     --suffix LD_LIBRARY_PATH ';' "${lib.makeSearchPath "lib" runtimeDeps_}" \

     

       77
       77
       -
                     --suffix PATH ';' "${lib.makeSearchPath "bin" runtimeDeps_}" \

     

       76
       76
       +
                     --suffix LD_LIBRARY_PATH ';' "${lib.makeLibraryPath runtimeDeps_}" \

     

       77
       77
       +
                     --suffix PATH ';' "${lib.makeBinPath runtimeDeps_}" \

     

       78
       78
        
                     --suffix LUA_PATH ';' "\"$LUA_PATH\"" \

     

       79
       79
        
                     --suffix LUA_PATH ';' "\"$out/share/lua/${lua.luaversion}/?.lua;$out/share/lua/${lua.luaversion}/?/init.lua\"" \

     

       80
       80
        
                     --suffix LUA_CPATH ';' "\"$LUA_CPATH\"" \

+1 -1

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

···

       63
       63
        
       

     

       64
       64
        
         ldpath = stdenv.lib.makeLibraryPath buildInputs

     

       65
       65
        
           + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")

     

       66
       66
       -
             (":" + stdenv.lib.makeSearchPath "lib64" buildInputs);

     

       66
       66
       +
             (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);

     

       67
       67
        
       

     

       68
       68
        
         phases = "unpackPhase installPhase fixupPhase";

     

       69
       69

+1 -1

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

···

       73
       73
        
       

     

       74
       74
        
         ldpath = stdenv.lib.makeLibraryPath buildInputs

     

       75
       75
        
           + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")

     

       76
       76
       -
             (":" + stdenv.lib.makeSearchPath "lib64" buildInputs);

     

       76
       76
       +
             (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);

     

       77
       77
        
       

     

       78
       78
        
         phases = "unpackPhase installPhase fixupPhase";

     

       79
       79

+1 -1

pkgs/applications/science/math/maxima/default.nix

···

       5
       5
        
         version = "5.36.1";

     

       6
       6
        
       

     

       7
       7
        
         searchPath =

     

       8
       8
       -
           stdenv.lib.makeSearchPath "bin"

     

       8
       8
       +
           stdenv.lib.makeBinPath

     

       9
       9
        
             (stdenv.lib.filter (x: x != null) [ sbcl rlwrap tk gnuplot ]);

     

       10
       10
        
       in

     

       11
       11
        
       stdenv.mkDerivation {

+1 -1

pkgs/applications/version-management/cvs-fast-export/default.nix

···

       39
       39
        
       

     

       40
       40
        
         postInstall =

     

       41
       41
        
           let

     

       42
       42
       -
             binpath = makeSearchPath "bin" [ out rcs cvs git coreutils rsync ];

     

       42
       42
       +
             binpath = makeBinPath [ out rcs cvs git coreutils rsync ];

     

       43
       43
        
           in ''

     

       44
       44
        
             for prog in cvs-fast-export cvsconvert cvssync; do

     

       45
       45
        
               wrapProgram $out/bin/$prog \

+1 -1

pkgs/applications/version-management/cvs2svn/default.nix

···

       15
       15
        
           python ./setup.py install --prefix=$out

     

       16
       16
        
           for i in bzr svn git; do

     

       17
       17
        
             wrapProgram $out/bin/cvs2$i \

     

       18
       18
       -
                 --prefix PATH : "${lib.makeSearchPath "bin" [ cvs ]}" \

     

       18
       18
       +
                 --prefix PATH : "${lib.makeBinPath [ cvs ]}" \

     

       19
       19
        
                 --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"

     

       20
       20
        
           done

     

       21
       21
        
         '';

+2 -2

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

···

       46
       46
        
       

     

       47
       47
        
         postInstall =

     

       48
       48
        
           let

     

       49
       49
       -
             binpath = makeSearchPath "bin" (

     

       49
       49
       +
             binpath = makeBinPath (

     

       50
       50
        
               filter (x: x != null)

     

       51
       51
        
               [ out git bazaar cvs darcs fossil mercurial

     

       52
       52
        
                 monotone rcs src subversion cvs_fast_export ]

     

       53
       53
        
             );

     

       54
       54
       -
             pythonpath = makeSearchPath (python27.sitePackages) (

     

       54
       54
       +
             pythonpath = makeSearchPathOutputs python27.sitePackages ["lib"] (

     

       55
       55
        
               filter (x: x != null)

     

       56
       56
        
               [ python27Packages.readline or null python27Packages.hglib or null ]

     

       57
       57
        
             );

+1 -1

pkgs/applications/version-management/smartgithg/default.nix

···

       24
       24
        
           pkg_path = "$out/${name}";

     

       25
       25
        
           bin_path = "$out/bin";

     

       26
       26
        
           install_freedesktop_items = ./install_freedesktop_items.sh;

     

       27
       27
       -
           runtime_paths = lib.makeSearchPath "bin" [

     

       27
       27
       +
           runtime_paths = lib.makeBinPath [

     

       28
       28
        
             jre

     

       29
       29
        
             #git mercurial subversion # the paths are requested in configuration

     

       30
       30
        
             which

+1 -1

pkgs/desktops/kde-5/applications-15.12/ark.nix

···

       20
       20
        
       , zip

     

       21
       21
        
       }:

     

       22
       22
        
       

     

       23
       23
       -
       let PATH = lib.makeSearchPath "bin" [

     

       23
       23
       +
       let PATH = lib.makeBinPath [

     

       24
       24
        
             p7zip unrar unzipNLS zip

     

       25
       25
        
           ];

     

       26
       26
        
       in

+1 -1

pkgs/development/arduino/arduino-core/default.nix

···

       50
       50
        
               fi

     

       51
       51
        
           done

     

       52
       52
        
       

     

       53
       53
       -
           patchelf --set-rpath ${stdenv.lib.makeSearchPath "lib" [ libusb ]} \

     

       53
       53
       +
           patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ libusb ]} \

     

       54
       54
        
               "$out/share/arduino/hardware/tools/avrdude"

     

       55
       55
        
         '';

     

       56
       56

+1 -1

pkgs/development/compilers/elm/default.nix

···

       50
       50
        
                     doCheck = false;

     

       51
       51
        
                     buildTools = drv.buildTools or [] ++ [ makeWrapper ];

     

       52
       52
        
                     postInstall =

     

       53
       53
       -
                       let bins = lib.makeSearchPath "bin" [ nodejs self.elm-make ];

     

       53
       53
       +
                       let bins = lib.makeBinPath [ nodejs self.elm-make ];

     

       54
       54
        
                       in ''

     

       55
       55
        
                         wrapProgram $out/bin/elm-repl \

     

       56
       56
        
                           --prefix PATH ':' ${bins}

+1 -1

pkgs/development/compilers/julia/default.nix

···

       128
       128
        
       

     

       129
       129
        
         NIX_CFLAGS_COMPILE = [ "-fPIC" ];

     

       130
       130
        
       

     

       131
       131
       -
         LD_LIBRARY_PATH = makeSearchPath "lib" [

     

       131
       131
       +
         LD_LIBRARY_PATH = makeLibraryPath [

     

       132
       132
        
           arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm

     

       133
       133
        
           openspecfun pcre2 suitesparse

     

       134
       134
        
         ];

+2 -2

pkgs/development/compilers/julia/git.nix

···

       130
       130
        
       

     

       131
       131
        
         NIX_CFLAGS_COMPILE = [ "-fPIC" ];

     

       132
       132
        
       

     

       133
       133
       -
         LD_LIBRARY_PATH = makeSearchPath "lib" (concatLists (map (x : x.all) [

     

       133
       133
       +
         LD_LIBRARY_PATH = makeLibraryPath [

     

       134
       134
        
           arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm

     

       135
       135
        
           openspecfun pcre2 suitesparse

     

       136
       136
       -
         ]));

     

       136
       136
       +
         ];

     

       137
       137
        
       

     

       138
       138
        
         dontStrip = true;

     

       139
       139
        
         dontPatchELF = true;

+1 -1

pkgs/development/haskell-modules/with-packages-wrapper.nix

···

       41
       41
        
         hasLibraries  = lib.any (x: x.isHaskellLibrary) paths;

     

       42
       42
        
         # CLang is needed on Darwin for -fllvm to work:

     

       43
       43
        
         # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html

     

       44
       44
       -
         llvm          = lib.makeSearchPath "bin"

     

       44
       44
       +
         llvm          = lib.makeBinPath

     

       45
       45
        
                         ([ llvmPackages.llvm ]

     

       46
       46
        
                          ++ lib.optional stdenv.isDarwin llvmPackages.clang);

     

       47
       47
        
       in

+1 -1

pkgs/development/mobile/androidenv/androidndk.nix

···

       32
       32
        
           sed_script_2 =

     

       33
       33
        
             "'s|^MYNDKDIR=`dirname $0`" +

     

       34
       34
        
             "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'";

     

       35
       35
       -
           runtime_paths = (lib.makeSearchPath "bin" [

     

       35
       35
       +
           runtime_paths = (lib.makeBinPath [

     

       36
       36
        
             coreutils file findutils

     

       37
       37
        
             gawk gnugrep gnused

     

       38
       38
        
             jdk

+1 -1

pkgs/development/mobile/androidenv/androidndk_r8e.nix

···

       32
       32
        
           sed_script_2 =

     

       33
       33
        
             "'s|^MYNDKDIR=`dirname $0`" +

     

       34
       34
        
             "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'";

     

       35
       35
       -
           runtime_paths = (lib.makeSearchPath "bin" [

     

       35
       35
       +
           runtime_paths = (lib.makeBinPath [

     

       36
       36
        
             coreutils file findutils

     

       37
       37
        
             gawk gnugrep gnused

     

       38
       38
        
             jdk

+8 -8

pkgs/development/tools/haskell/lambdabot/default.nix

···

       14
       14
        
             inherit haskellPackages;

     

       15
       15
        
             packages = allPkgs;

     

       16
       16
        
           };

     

       17
       17
       -
           bins = lib.makeSearchPath "bin" ([ mueval'

     

       18
       18
       -
                                              (haskellPackages.ghcWithPackages allPkgs)

     

       19
       19
       -
                                              haskellPackages.unlambda

     

       20
       20
       -
                                              haskellPackages.brainfuck

     

       21
       21
       -
                                            ]

     

       22
       22
       -
                                            ++ lib.optional withDjinn haskellPackages.djinn

     

       23
       23
       -
                                            ++ lib.optional (aspell != null) aspell

     

       24
       24
       -
                                           );

     

       17
       17
       +
           bins = lib.makeBinPath ([ mueval'

     

       18
       18
       +
                                     (haskellPackages.ghcWithPackages allPkgs)

     

       19
       19
       +
                                     haskellPackages.unlambda

     

       20
       20
       +
                                     haskellPackages.brainfuck

     

       21
       21
       +
                                   ]

     

       22
       22
       +
                                   ++ lib.optional withDjinn haskellPackages.djinn

     

       23
       23
       +
                                   ++ lib.optional (aspell != null) aspell

     

       24
       24
       +
                                  );

     

       25
       25
        
           modulesStr = lib.replaceChars ["\n"] [" "] modules;

     

       26
       26
        
           configStr = lib.replaceChars ["\n"] [" "] configuration;

     

       27
       27

+1 -1

pkgs/development/web/grails/default.nix

···

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         binpath = stdenv.lib.makeSearchPath "bin"

     

       9
       9
       +
         binpath = stdenv.lib.makeBinPath

     

       10
       10
        
           ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk);

     

       11
       11
        
       in

     

       12
       12
        
       stdenv.mkDerivation rec {

+1 -1

pkgs/games/adom/default.nix

···

       6
       6
        
       

     

       7
       7
        
         inherit (xorg) libXext libX11;

     

       8
       8
        
       

     

       9
       9
       -
         lpath = "${stdenv.cc.cc}/lib64:" + stdenv.lib.makeSearchPath "lib" [

     

       9
       9
       +
         lpath = "${stdenv.cc.cc.lib}/lib64:" + stdenv.lib.makeLibraryPath [

     

       10
       10
        
             zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio];

     

       11
       11
        
       

     

       12
       12
        
       in

+1 -1

pkgs/games/ue4demos/default.nix

···

       12
       12
        
       

     

       13
       13
        
             rtdeps = stdenv.lib.makeLibraryPath

     

       14
       14
        
               [ xorg.libXxf86vm xorg.libXext openal ]

     

       15
       15
       -
               + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.cc ];

     

       15
       15
       +
               + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [ stdenv.cc.cc ];

     

       16
       16
        
       

     

       17
       17
        
             buildCommand =

     

       18
       18
        
             ''

+1 -1

pkgs/misc/cups/filters.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
       -
         binPath = stdenv.lib.makeSearchPath "bin" [ coreutils gnused bc gawk gnugrep which ];

     

       7
       7
       +
         binPath = stdenv.lib.makeBinPath [ coreutils gnused bc gawk gnugrep which ];

     

       8
       8
        
       

     

       9
       9
        
       in stdenv.mkDerivation rec {

     

       10
       10
        
         name = "cups-filters-${version}";

+1 -1

pkgs/os-specific/linux/fanctl/default.nix

···

       23
       23
        
         postPatch = ''

     

       24
       24
        
           substituteInPlace fanctl \

     

       25
       25
        
             --replace '@PATH@' \

     

       26
       26
       -
                       '${lib.makeSearchPath "bin" [

     

       26
       26
       +
                       '${lib.makeBinPath [

     

       27
       27
        
                            gnugrep gawk coreutils bridge-utils iproute dnsmasq

     

       28
       28
        
                            iptables kmod utillinux gnused

     

       29
       29
        
                            glibc # needed for getent

+1 -1

pkgs/os-specific/linux/pipework/default.nix

···

       16
       16
        
           mkdir -p $out/bin

     

       17
       17
        
           cp pipework $out/bin

     

       18
       18
        
           wrapProgram $out/bin/pipework --prefix PATH : \

     

       19
       19
       -
             ${lib.makeSearchPath "bin" [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]};

     

       19
       19
       +
             ${lib.makeBinPath [ bridge-utils iproute lxc openvswitch docker busybox dhcpcd dhcp ]};

     

       20
       20
        
         '';

     

       21
       21
        
         meta = with lib; {

     

       22
       22
        
           description = "Software-Defined Networking tools for LXC";

+2 -2

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

···

       3
       3
        
       

     

       4
       4
        
       let

     

       5
       5
        
       

     

       6
       6
       -
         binPath = stdenv.lib.makeSearchPath "bin"

     

       6
       6
       +
         binPath = stdenv.lib.makeBinPath

     

       7
       7
        
           [ coreutils gnugrep utillinux module_init_tools procps kbd dbus_tools ];

     

       8
       8
        
       

     

       9
       9
       -
         sbinPath = stdenv.lib.makeSearchPath "sbin"

     

       9
       9
       +
         sbinPath = stdenv.lib.makeSearchPathOutputs "sbin" ["bin"]

     

       10
       10
        
           [ procps ];

     

       11
       11
        
       

     

       12
       12
        
       in

+1 -1

pkgs/servers/mail/dspam/default.nix

···

       15
       15
        
                    ++ lib.optional withSQLite "sqlite3_drv"

     

       16
       16
        
                    ++ lib.optional withDB "libdb4_drv"

     

       17
       17
        
                   );

     

       18
       18
       -
         maintenancePath = lib.makeSearchPath "bin" [ gawk gnused gnugrep coreutils which ];

     

       18
       18
       +
         maintenancePath = lib.makeBinPath [ gawk gnused gnugrep coreutils which ];

     

       19
       19
        
       

     

       20
       20
        
       in stdenv.mkDerivation rec {

     

       21
       21
        
         name = "dspam-3.10.2";

+1 -1

pkgs/servers/xmpp/ejabberd/default.nix

···

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       let

     

       16
       16
       -
         ctlpath = lib.makeSearchPath "bin" [ bash gnused gnugrep coreutils utillinux procps ];

     

       16
       16
       +
         ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];

     

       17
       17
        
       

     

       18
       18
        
         fakegit = writeScriptBin "git" ''

     

       19
       19
        
           #! ${stdenv.shell} -e

+1 -1

pkgs/tools/X11/bumblebee/default.nix

···

       43
       43
        
       

     

       44
       44
        
         nvidiaLibs = lib.makeLibraryPath nvidia_x11s;

     

       45
       45
        
       

     

       46
       46
       -
         bbdPath = lib.makeSearchPath "bin" [ module_init_tools xorgserver ];

     

       46
       46
       +
         bbdPath = lib.makeBinPath [ module_init_tools xorgserver ];

     

       47
       47
        
         bbdLibs = lib.makeLibraryPath [ libX11 libXext ];

     

       48
       48
        
       

     

       49
       49
        
         xmodules = lib.concatStringsSep "," (map (x: "${x}/lib/xorg/modules") ([ xorgserver ] ++ lib.optional (!useNvidia) xf86videonouveau));

+1 -1

pkgs/tools/cd-dvd/brasero/default.nix

···

       5
       5
        
       let

     

       6
       6
        
         major = "3.12";

     

       7
       7
        
         minor = "0";

     

       8
       8
       -
         binpath = stdenv.lib.makeSearchPath "bin" [ dvdauthor cdrdao dvdplusrwtools cdrtools ];

     

       8
       8
       +
         binpath = stdenv.lib.makeBinPath [ dvdauthor cdrdao dvdplusrwtools cdrtools ];

     

       9
       9
        
       

     

       10
       10
        
       in stdenv.mkDerivation rec {

     

       11
       11
        
         version = "${major}.${minor}";

+1 -1

pkgs/tools/graphics/fgallery/default.nix

···

       34
       34
        
       

     

       35
       35
        
           wrapProgram "$out/share/fgallery/fgallery" \

     

       36
       36
        
               --set PERL5LIB "$PERL5LIB" \

     

       37
       37
       -
               --set PATH "${stdenv.lib.makeSearchPath "bin"

     

       37
       37
       +
               --set PATH "${stdenv.lib.makeBinPath

     

       38
       38
        
                            [ coreutils zip imagemagick pngcrush lcms2 fbida ]}"

     

       39
       39
        
         '';

     

       40
       40

+2 -2

pkgs/tools/graphics/imgur-screenshot/default.nix

···

       1
       1
        
       { stdenv, fetchFromGitHub, makeWrapper, curl, gnugrep, libnotify, scrot, which, xclip }:

     

       2
       2
        
       

     

       3
       3
       -
       let deps = stdenv.lib.makeSearchPath "bin" [ curl gnugrep libnotify scrot which xclip ];

     

       3
       3
       +
       let deps = stdenv.lib.makeBinPath [ curl gnugrep libnotify scrot which xclip ];

     

       4
       4
        
       in stdenv.mkDerivation rec {

     

       5
       5
        
         version = "1.5.4";

     

       6
       6
        
         name = "imgur-screenshot-${version}";

     
···

       26
       26
        
           license = licenses.mit;

     

       27
       27
        
           maintainers = with maintainers; [ lw ];

     

       28
       28
        
         };

     

       29
       29
       -
       }
     

       29
       29
       +
       }

+1 -1

pkgs/tools/graphics/imgurbash2/default.nix

···

       15
       15
        
           mkdir -p $out/bin

     

       16
       16
        
           cat <<EOF >$out/bin/imgurbash2

     

       17
       17
        
           #!${bash}/bin/bash

     

       18
       18
       -
           PATH=${stdenv.lib.makeSearchPath "bin" [curl xsel]}:\$PATH

     

       18
       18
       +
           PATH=${stdenv.lib.makeBinPath [curl xsel]}:\$PATH

     

       19
       19
        
           EOF

     

       20
       20
        
           cat imgurbash2 >> $out/bin/imgurbash2

     

       21
       21
        
           chmod +x $out/bin/imgurbash2

+1 -1

pkgs/tools/misc/tlp/default.nix

···

       26
       26
        
       

     

       27
       27
        
         buildInputs = [ perl ];

     

       28
       28
        
       

     

       29
       29
       -
         paths = lib.makeSearchPath "bin"

     

       29
       29
       +
         paths = lib.makeBinPath

     

       30
       30
        
                 ([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools

     

       31
       31
        
                    x86_energy_perf_policy gawk gnugrep coreutils

     

       32
       32
        
                  ]

+1 -1

pkgs/tools/misc/xfstests/default.nix

···

       72
       72
        
             ln -s @out@/lib/xfstests/$f $f

     

       73
       73
        
           done

     

       74
       74
        
       

     

       75
       75
       -
           export PATH=${lib.makeSearchPath "bin" [acl attr bc e2fsprogs fio gawk libcap_progs lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH

     

       75
       75
       +
           export PATH=${lib.makeBinPath [acl attr bc e2fsprogs fio gawk libcap_progs lvm2 perl procps psmisc su utillinux which xfsprogs]}:$PATH

     

       76
       76
        
           exec ./check "$@"

     

       77
       77
        
         '';

     

       78
       78

+1 -1

pkgs/tools/security/pass/default.nix

···

       61
       61
        
           '' else ""}

     

       62
       62
        
         '';

     

       63
       63
        
       

     

       64
       64
       -
         wrapperPath = with stdenv.lib; makeSearchPath "bin/" ([

     

       64
       64
       +
         wrapperPath = with stdenv.lib; makeBinPath ([

     

       65
       65
        
           coreutils

     

       66
       66
        
           gnused

     

       67
       67
        
           getopt

+1 -1

pkgs/tools/security/pass/rofi-pass.nix

···

       24
       24
        
           cp -a $src/config.example $out/share/doc/rofi-pass/config.example

     

       25
       25
        
         '';

     

       26
       26
        
       

     

       27
       27
       -
         wrapperPath = with stdenv.lib; makeSearchPath "bin/" [

     

       27
       27
       +
         wrapperPath = with stdenv.lib; makeBinPath [

     

       28
       28
        
           coreutils

     

       29
       29
        
           findutils

     

       30
       30
        
           gnugrep

+1 -1

pkgs/tools/security/pcsctools/default.nix

···

       3
       3
        
       , perl, pcscperl, Glib, Gtk2, Pango

     

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
       -
       let deps = lib.makeSearchPath "bin" [ wget coreutils ];

     

       6
       6
       +
       let deps = lib.makeBinPath [ wget coreutils ];

     

       7
       7
        
       

     

       8
       8
        
       in stdenv.mkDerivation rec {

     

       9
       9
        
         name = "pcsc-tools-1.4.25";