diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:20:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:21:06 +0000 |
commit | a42c1d6d62656dcf9bd85de620f2e200a5ad22d8 (patch) | |
tree | 7d481fea9872f62a034452612be17f4494159baa /nixpkgs/pkgs/development/libraries/science | |
parent | 55f69a6b0e53c1c4b3e0396937c53bf5662b5519 (diff) | |
parent | 9480bae337095fd24f61380bce3174fdfe926a00 (diff) | |
download | nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.gz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.bz2 nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.lz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.xz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.zst nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.zip |
Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'
This is the last nixos-unstable release before 13b2903169f, which I'm a bit nervous about. So I want the update including that one to be as small as possible, hence going to this one first.
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/science')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 016864abed8c..19f988d965c4 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,9 +1,9 @@ { stdenvNoCC , fetchurl -, pkgconfig , rpmextract , undmg , darwin +, validatePkgConfig , enableStatic ? false }: @@ -46,15 +46,11 @@ in stdenvNoCC.mkDerivation { sha256 = "0v86hrqg15mbc78m9qk8dbkaaq3mlwashgbf9n79kxpl1gilnah8"; }); - nativeBuildInputs = if stdenvNoCC.isDarwin + nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin then [ undmg darwin.cctools ] else - [ rpmextract ]; - - installCheckInputs = [ pkgconfig ]; - - doInstallCheck = true; + [ rpmextract ]); buildPhase = if stdenvNoCC.isDarwin then '' for f in Contents/Resources/pkg/*.tgz; do @@ -152,11 +148,6 @@ in stdenvNoCC.mkDerivation { install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib ''; - # Validate pkgconfig files, since they break often on updates. - installCheckPhase = '' - pkg-config --validate $out/lib/pkgconfig/*.pc - ''; - # Per license agreement, do not modify the binary dontStrip = true; dontPatchELF = true; |