diff options
| author | Fabián Heredia Montiel <303897+fabianhjr@users.noreply.github.com> | 2023-10-01 22:53:43 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-01 22:53:43 -0600 |
| commit | 72b10ff62f9da475e13e8bbc677f6deaefaa0c69 (patch) | |
| tree | 0aefda3603a3c8e0132f383b8a45989b6c6478dd | |
| parent | 6677927236025bd0cb07f5df5d9413aa66499603 (diff) | |
| parent | f1116caeb6c4d101257220381e1cc3d61dc71c46 (diff) | |
Merge pull request #258278 from markuskowa/split-libxsmm
libxsmm: split outputs -> out, dev, doc
| -rw-r--r-- | pkgs/applications/science/chemistry/cp2k/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libxsmm/default.nix | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index 29b983cde5367..e34e723c7a4e7 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { -ftree-vectorize -funroll-loops -msse2 \ -std=f2008 \ -fopenmp -ftree-vectorize -funroll-loops \ - -I${libxc}/include -I${libxsmm}/include \ + -I${libxc}/include -I${lib.getDev libxsmm}/include \ -I${libint}/include ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"} LIBS = -lfftw3 -lfftw3_threads \ -lscalapack -lblas -llapack \ diff --git a/pkgs/development/libraries/libxsmm/default.nix b/pkgs/development/libraries/libxsmm/default.nix index 893fb4697ac91..6530ee7f67ae3 100644 --- a/pkgs/development/libraries/libxsmm/default.nix +++ b/pkgs/development/libraries/libxsmm/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-PpMiD/PeQ0pe5hqFG6VFHWpR8y3wnO2z1dJfHHeItlQ="; }; + outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ gfortran python3 @@ -34,6 +35,13 @@ stdenv.mkDerivation rec { "STATIC=${static}" ]; + postInstall = '' + mkdir -p $dev/lib/pkgconfig + mv $out/lib/*.pc $dev/lib/pkgconfig + + moveToOutput "share/libxsmm" "$doc" + ''; + prePatch = '' patchShebangs . ''; |