diff options
author | Benjamin Hipple <bhipple@protonmail.com> | 2020-02-02 20:24:23 -0500 |
---|---|---|
committer | Jon <jonringer@users.noreply.github.com> | 2020-02-12 10:26:54 -0800 |
commit | ed5f25f6a19d0ac280c6894704612d859577700c (patch) | |
tree | a0217ab8c053627968a73957c24bdf8c735288f7 | |
parent | 7b61246b95bd8a6e22a568f8070671713419b85e (diff) | |
download | nixpkgs-ed5f25f6a19d0ac280c6894704612d859577700c.tar nixpkgs-ed5f25f6a19d0ac280c6894704612d859577700c.tar.gz nixpkgs-ed5f25f6a19d0ac280c6894704612d859577700c.tar.bz2 nixpkgs-ed5f25f6a19d0ac280c6894704612d859577700c.tar.lz nixpkgs-ed5f25f6a19d0ac280c6894704612d859577700c.tar.xz nixpkgs-ed5f25f6a19d0ac280c6894704612d859577700c.tar.zst nixpkgs-ed5f25f6a19d0ac280c6894704612d859577700c.zip |
dnnl: run tests, fix install tree
With the new update to 1.2 in https://github.com/NixOS/nixpkgs/pull/79426, some the install tree coming out of cmake seems to have produced a duplicate copy of the nix tree.
-rw-r--r-- | pkgs/development/libraries/dnnl/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/dnnl/default.nix index 4f5e4148baa..73a6ff77522 100644 --- a/pkgs/development/libraries/dnnl/default.nix +++ b/pkgs/development/libraries/dnnl/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "17xpdwqjfb2bq586gnk3hq94r06jd8pk6qfs703qqd7155fkbil9"; }; - # Generic fix upstreamed in https://github.com/intel/mkl-dnn/pull/631 - # Delete patch when 1.2.0 is released + # Generic fix merged upstream in https://github.com/intel/mkl-dnn/pull/631 + # Delete after next release patches = [ (substituteAll { src = ./bash-to-sh.patch; inherit bash; @@ -22,12 +22,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + doCheck = true; + # The test driver doesn't add an RPath to the build libdir preCheck = '' export LD_LIBRARY_PATH=$PWD/src ''; - doCheck = true; + # The cmake install gets tripped up and installs a nix tree into $out, in + # addition to the correct install; clean it up. + postInstall = '' + rm -r $out/nix + ''; meta = with lib; { description = "Deep Neural Network Library (DNNL)"; |