diff options
author | markuskowa <markus.kowalewski@gmail.com> | 2023-10-12 09:45:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-12 09:45:50 +0200 |
commit | 094ca95e014081ae0ad0c7d7d986d806f9dc98f8 (patch) | |
tree | 7553d59b00c340fb2abd690fb51bd943db8f0fee /pkgs/applications/science | |
parent | 2b52388d1902fef2618ae0157c78660380d48e29 (diff) | |
parent | e3638150f27cdf6b8fa0cfeb695e7455c5d62fd5 (diff) |
Merge pull request #259737 from markuskowa/split-gromacs
gromacs: use multiple outputs
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/molecular-dynamics/gromacs/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch | 24 |
2 files changed, 30 insertions, 4 deletions
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index f6301ff6fce6c..cb1dbc15b3367 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -27,6 +27,10 @@ in stdenv.mkDerivation rec { sha256 = "sha256-vOFIByfksruQBBO3XZmjJm81B4d9pPWy1JHfeY+fza4="; }; + patches = [ ./pkgconfig.patch ]; + + outputs = [ "out" "dev" "man" ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ @@ -64,10 +68,8 @@ in stdenv.mkDerivation rec { ] ) ++ lib.optional enableCuda "-DGMX_GPU=CUDA"; - postFixup = '' - substituteInPlace "$out"/lib/pkgconfig/*.pc \ - --replace '=''${prefix}//' '=/' \ - --replace "$out/$out/" "$out/" + postInstall = '' + moveToOutput share/cmake $dev ''; meta = with lib; { diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch b/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch new file mode 100644 index 0000000000000..6740d2312369e --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch @@ -0,0 +1,24 @@ +diff --git a/src/external/muparser/muparser.pc.in b/src/external/muparser/muparser.pc.in +index 646787cb53..9b97ad57f7 100644 +--- a/src/external/muparser/muparser.pc.in ++++ b/src/external/muparser/muparser.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: @PACKAGE_NAME@ + Description: Mathematical expressions parser library +diff --git a/src/gromacs/libgromacs.pc.cmakein b/src/gromacs/libgromacs.pc.cmakein +index ec1ed6684e..ca1105474a 100644 +--- a/src/gromacs/libgromacs.pc.cmakein ++++ b/src/gromacs/libgromacs.pc.cmakein +@@ -1,4 +1,4 @@ +-libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ + + Name: libgromacs@GMX_LIBS_SUFFIX@ + Description: Gromacs library |