public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkl: use validatePkgConfig hook

Browse Source
This commit is contained in:
Daniël de Kok 2020-05-15 08:35:44 +02:00
parent 13083b1a01
commit 127cdd0cab
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/science/math/mkl/default.nix
View File

@ -1,9 +1,9 @@
{ stdenvNoCC { stdenvNoCC
, fetchurl , fetchurl
, pkgconfig
, rpmextract , rpmextract
, undmg , undmg
, darwin , darwin
, validatePkgConfig
, enableStatic ? false , enableStatic ? false
}: }:
@ -46,15 +46,11 @@ in stdenvNoCC.mkDerivation {
sha256 = "0v86hrqg15mbc78m9qk8dbkaaq3mlwashgbf9n79kxpl1gilnah8"; sha256 = "0v86hrqg15mbc78m9qk8dbkaaq3mlwashgbf9n79kxpl1gilnah8";
}); });
nativeBuildInputs = if stdenvNoCC.isDarwin nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin
then then
[ undmg darwin.cctools ] [ undmg darwin.cctools ]
else else
[ rpmextract ]; [ rpmextract ]);
installCheckInputs = [ pkgconfig ];
doInstallCheck = true;
buildPhase = if stdenvNoCC.isDarwin then '' buildPhase = if stdenvNoCC.isDarwin then ''
for f in Contents/Resources/pkg/*.tgz; do 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 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 # Per license agreement, do not modify the binary
dontStrip = true; dontStrip = true;
dontPatchELF = true; dontPatchELF = true;