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/development/haskell-modules/with-packages-wrapper.nix | |
| parent | e26119619f7ce64b065e692ba0cd31f53b9ef637 (diff) | |
| download | nixpkgs-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar nixpkgs-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.gz nixpkgs-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.bz2 nixpkgs-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.lz nixpkgs-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.xz nixpkgs-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.tar.zst nixpkgs-8b7ebaffeb3087ef18ff5c0f38cc3f44f7f8124e.zip | |
replace makeSearchPath tree-wise to take care of possible multiple outputs
Diffstat (limited to 'pkgs/development/haskell-modules/with-packages-wrapper.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/with-packages-wrapper.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 740047e2c27..66e151aefe3 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 |