Skip to content

Commit

Permalink
mkl: use validatePkgConfig hook
Browse files Browse the repository at this point in the history
  • Loading branch information
danieldk committed May 31, 2020
1 parent 13083b1 commit 127cdd0
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions pkgs/development/libraries/science/math/mkl/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{ stdenvNoCC
, fetchurl
, pkgconfig
, rpmextract
, undmg
, darwin
, validatePkgConfig
, enableStatic ? false
}:

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 127cdd0

Please sign in to comment.