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

dnnl: run tests, fix install tree

Browse Source 
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.
This commit is contained in:
Benjamin Hipple 2020-02-02 20:24:23 -05:00 committed by Jon
parent 7b61246b95
commit ed5f25f6a1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/dnnl/default.nix
View File

@ -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)";