From 1d953af53e724c3aa3ff3bbd6b5a12cfa978518c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 30 Sep 2023 16:05:42 +0200 Subject: [PATCH 1/2] cp2k: fix libxc includes (use getDev) --- pkgs/applications/science/chemistry/cp2k/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index e34e723c7a4e..7a0b6eb0d55c 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${lib.getDev libxsmm}/include \ + -I${lib.getDev 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 \ From ef2d57ee1c16eafda5305b2532ca14bdbedf24d2 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 30 Sep 2023 16:05:10 +0200 Subject: [PATCH 2/2] libxc: split outputs -> out, dev --- pkgs/development/libraries/libxc/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index ff47a3881e04..b3f20d02c533 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { --replace "PROPERTIES TIMEOUT 1" "PROPERTIES TIMEOUT 30" ''; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ perl cmake gfortran ]; preConfigure = ''