diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 07:53:37 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 07:53:37 +0200 |
| commit | bb10352242dceb863069797bb92131944b0ac62f (patch) | |
| tree | d3f5ceea6723e3d6c901652146e41ffe45100c9b /pkgs/build-support | |
| parent | 7fb1ff90031c59cbc9ef79224516a74bc138c7a6 (diff) | |
| parent | 5c70040db2dd2123f7728f1bdcd40d5018de0ef9 (diff) | |
| download | nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.gz nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.bz2 nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.lz nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.xz nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.zst nixlib-bb10352242dceb863069797bb92131944b0ac62f.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/alternatives/blas/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/alternatives/lapack/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/trivial-builders.nix | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 8bba49b45504..bdee6688a740 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { installPhase = ('' mkdir -p $out/lib $dev/include $dev/lib/pkgconfig - libblas="${lib.getLib blasProvider}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" + libblas="${lib.getLib blasProvider}/lib/libblas${canonicalExtension}" if ! [ -e "$libblas" ]; then echo "$libblas does not exist, ${blasProvider.name} does not provide libblas." @@ -100,7 +100,7 @@ Libs: -L$out/lib -lblas Cflags: -I$dev/include EOF - libcblas="${lib.getLib blasProvider}/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" + libcblas="${lib.getLib blasProvider}/lib/libcblas${canonicalExtension}" if ! [ -e "$libcblas" ]; then echo "$libcblas does not exist, ${blasProvider.name} does not provide libcblas." diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index e260ad1bd931..5a19916f83e4 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { installPhase = ('' mkdir -p $out/lib $dev/include $dev/lib/pkgconfig - liblapack="${lib.getLib lapackProvider}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" + liblapack="${lib.getLib lapackProvider}/lib/liblapack${canonicalExtension}" if ! [ -e "$liblapack" ]; then echo "$liblapack does not exist, ${lapackProvider.name} does not provide liblapack." @@ -74,7 +74,7 @@ Cflags: -I$dev/include Libs: -L$out/lib -llapack EOF - liblapacke="${lib.getLib lapackProvider}/lib/liblapacke${stdenv.hostPlatform.extensions.sharedLibrary}" + liblapacke="${lib.getLib lapackProvider}/lib/liblapacke${canonicalExtension}" if ! [ -e "$liblapacke" ]; then echo "$liblapacke does not exist, ${lapackProvider.name} does not provide liblapacke." diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index c67f5845135b..3c81a4ece657 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -4,7 +4,8 @@ let runCommand' = runLocal: stdenv: name: env: buildCommand: stdenv.mkDerivation ({ - inherit name buildCommand; + name = lib.strings.sanitizeDerivationName name; + inherit buildCommand; passAsFile = [ "buildCommand" ]; } // (lib.optionalAttrs runLocal { |