diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 016864abed8..19f988d965c 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/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;