Merge pull request #259737 from markuskowa/split-gromacs

gromacs: use multiple outputs
This commit is contained in:
markuskowa 2023-10-12 09:45:50 +02:00 committed by GitHub
commit 094ca95e01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 4 deletions

View file

@ -27,6 +27,10 @@ in stdenv.mkDerivation rec {
sha256 = "sha256-vOFIByfksruQBBO3XZmjJm81B4d9pPWy1JHfeY+fza4="; sha256 = "sha256-vOFIByfksruQBBO3XZmjJm81B4d9pPWy1JHfeY+fza4=";
}; };
patches = [ ./pkgconfig.patch ];
outputs = [ "out" "dev" "man" ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ buildInputs = [
@ -64,10 +68,8 @@ in stdenv.mkDerivation rec {
] ]
) ++ lib.optional enableCuda "-DGMX_GPU=CUDA"; ) ++ lib.optional enableCuda "-DGMX_GPU=CUDA";
postFixup = '' postInstall = ''
substituteInPlace "$out"/lib/pkgconfig/*.pc \ moveToOutput share/cmake $dev
--replace '=''${prefix}//' '=/' \
--replace "$out/$out/" "$out/"
''; '';
meta = with lib; { meta = with lib; {

View file

@ -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