diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-02-03 09:26:35 +0100 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-02-03 09:26:35 +0100 |
| commit | 899a451e08f7d6d2c8214d119c2a0316849a0ed4 (patch) | |
| tree | 5e72a7288b7d2b33fead36fbfe91a02a48ff7fef /nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix | |
| parent | 5962418b6543dfb3ca34965c0fa16dd77543801b (diff) | |
| parent | a21c2fa3ea2b88e698db6fc151d9c7259ae14d96 (diff) | |
Merge commit 'a21c2fa3ea2b88e698db6fc151d9c7259ae14d96'
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix index d26af8438e7..2ce17765d63 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/llvm.nix @@ -2,7 +2,7 @@ , fetch , fetchpatch , cmake -, python +, python3 , libffi , libbfd , libxml2 @@ -37,8 +37,8 @@ stdenv.mkDerivation ({ outputs = [ "out" "python" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; - nativeBuildInputs = [ cmake python ] - ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + nativeBuildInputs = [ cmake python3 ] + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; buildInputs = [ libxml2 libffi ]; @@ -119,7 +119,7 @@ stdenv.mkDerivation ({ ''; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib ''; postInstall = '' |