diff options
| author | Markus Kowalewski <markus.kowalewski@gmail.com> | 2023-10-08 00:25:52 +0200 |
|---|---|---|
| committer | Markus Kowalewski <markus.kowalewski@gmail.com> | 2023-10-08 11:29:14 +0200 |
| commit | e3638150f27cdf6b8fa0cfeb695e7455c5d62fd5 (patch) | |
| tree | ea01cd42d8f5adeb1c265c1db20363c77385347f /pkgs/applications/science/molecular-dynamics/gromacs | |
| parent | 41ecbefae57a62233326445816187901c661c6b6 (diff) | |
gromacs: split outputs
fix patching of pkgconfig files
Diffstat (limited to 'pkgs/applications/science/molecular-dynamics/gromacs')
| -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 |