Merge pull request #259737 from markuskowa/split-gromacs

gromacs: use multiple outputs

authored by

markuskowa and committed by
GitHub
094ca95e 2b52388d

+30 -4
+6 -4
pkgs/applications/science/molecular-dynamics/gromacs/default.nix
··· 27 27 sha256 = "sha256-vOFIByfksruQBBO3XZmjJm81B4d9pPWy1JHfeY+fza4="; 28 28 }; 29 29 30 + patches = [ ./pkgconfig.patch ]; 31 + 32 + outputs = [ "out" "dev" "man" ]; 33 + 30 34 nativeBuildInputs = [ cmake ]; 31 35 32 36 buildInputs = [ ··· 64 68 ] 65 69 ) ++ lib.optional enableCuda "-DGMX_GPU=CUDA"; 66 70 67 - postFixup = '' 68 - substituteInPlace "$out"/lib/pkgconfig/*.pc \ 69 - --replace '=''${prefix}//' '=/' \ 70 - --replace "$out/$out/" "$out/" 71 + postInstall = '' 72 + moveToOutput share/cmake $dev 71 73 ''; 72 74 73 75 meta = with lib; {
+24
pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch
··· 1 + diff --git a/src/external/muparser/muparser.pc.in b/src/external/muparser/muparser.pc.in 2 + index 646787cb53..9b97ad57f7 100644 3 + --- a/src/external/muparser/muparser.pc.in 4 + +++ b/src/external/muparser/muparser.pc.in 5 + @@ -1,7 +1,5 @@ 6 + -prefix=@CMAKE_INSTALL_PREFIX@ 7 + -exec_prefix=${prefix} 8 + -libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ 9 + -includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ 10 + +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ 11 + +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ 12 + 13 + Name: @PACKAGE_NAME@ 14 + Description: Mathematical expressions parser library 15 + diff --git a/src/gromacs/libgromacs.pc.cmakein b/src/gromacs/libgromacs.pc.cmakein 16 + index ec1ed6684e..ca1105474a 100644 17 + --- a/src/gromacs/libgromacs.pc.cmakein 18 + +++ b/src/gromacs/libgromacs.pc.cmakein 19 + @@ -1,4 +1,4 @@ 20 + -libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ 21 + +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ 22 + 23 + Name: libgromacs@GMX_LIBS_SUFFIX@ 24 + Description: Gromacs library