diff options
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/arduino/arduino-core/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/elm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/julia/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/julia/git.nix | 4 | ||||
-rw-r--r-- | pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/androidndk.nix | 2 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/androidndk_r8e.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/haskell/lambdabot/default.nix | 16 | ||||
-rw-r--r-- | pkgs/development/web/grails/default.nix | 2 |
9 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 7a960dc931b9b..37947c804b8b8 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { fi done - patchelf --set-rpath ${stdenv.lib.makeSearchPath "lib" [ libusb ]} \ + patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ libusb ]} \ "$out/share/arduino/hardware/tools/avrdude" ''; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 7fedbed282931..87211ff6e6ed0 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -50,7 +50,7 @@ let doCheck = false; buildTools = drv.buildTools or [] ++ [ makeWrapper ]; postInstall = - let bins = lib.makeSearchPath "bin" [ nodejs self.elm-make ]; + let bins = lib.makeBinPath [ nodejs self.elm-make ]; in '' wrapProgram $out/bin/elm-repl \ --prefix PATH ':' ${bins} diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 0c0520533bcd2..9886dc4d52ad0 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-fPIC" ]; - LD_LIBRARY_PATH = makeSearchPath "lib" [ + LD_LIBRARY_PATH = makeLibraryPath [ arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm openspecfun pcre2 suitesparse ]; diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index 1b3ef86cdbe70..2fbe50fbc9f1e 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -130,10 +130,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-fPIC" ]; - LD_LIBRARY_PATH = makeSearchPath "lib" (concatLists (map (x : x.all) [ + LD_LIBRARY_PATH = makeLibraryPath [ arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm openspecfun pcre2 suitesparse - ])); + ]; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 740047e2c27f5..66e151aefe3c0 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -41,7 +41,7 @@ let hasLibraries = lib.any (x: x.isHaskellLibrary) paths; # CLang is needed on Darwin for -fllvm to work: # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html - llvm = lib.makeSearchPath "bin" + llvm = lib.makeBinPath ([ llvmPackages.llvm ] ++ lib.optional stdenv.isDarwin llvmPackages.clang); in diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 0ae5fc3b5403f..63ea07b78a601 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sed_script_2 = "'s|^MYNDKDIR=`dirname $0`" + "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; - runtime_paths = (lib.makeSearchPath "bin" [ + runtime_paths = (lib.makeBinPath [ coreutils file findutils gawk gnugrep gnused jdk diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 428cef49a2d14..1896a615ac1eb 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sed_script_2 = "'s|^MYNDKDIR=`dirname $0`" + "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; - runtime_paths = (lib.makeSearchPath "bin" [ + runtime_paths = (lib.makeBinPath [ coreutils file findutils gawk gnugrep gnused jdk diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix index 01dfe339d141b..85d4bfc93b6ae 100644 --- a/pkgs/development/tools/haskell/lambdabot/default.nix +++ b/pkgs/development/tools/haskell/lambdabot/default.nix @@ -14,14 +14,14 @@ let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ pac inherit haskellPackages; packages = allPkgs; }; - bins = lib.makeSearchPath "bin" ([ mueval' - (haskellPackages.ghcWithPackages allPkgs) - haskellPackages.unlambda - haskellPackages.brainfuck - ] - ++ lib.optional withDjinn haskellPackages.djinn - ++ lib.optional (aspell != null) aspell - ); + bins = lib.makeBinPath ([ mueval' + (haskellPackages.ghcWithPackages allPkgs) + haskellPackages.unlambda + haskellPackages.brainfuck + ] + ++ lib.optional withDjinn haskellPackages.djinn + ++ lib.optional (aspell != null) aspell + ); modulesStr = lib.replaceChars ["\n"] [" "] modules; configStr = lib.replaceChars ["\n"] [" "] configuration; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 357e77009c4d6..5b9e27b4829f0 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -6,7 +6,7 @@ }: let - binpath = stdenv.lib.makeSearchPath "bin" + binpath = stdenv.lib.makeBinPath ([ coreutils ncurses gnused gnugrep ] ++ stdenv.lib.optional (jdk != null) jdk); in stdenv.mkDerivation rec { |