Unverified Commit 094ca95e authored by markuskowa's avatar markuskowa Committed by GitHub
Browse files

Merge pull request #259737 from markuskowa/split-gromacs 

gromacs: use multiple outputs
parents 2b52388d e3638150

pkgs/applications/science/molecular-dynamics/gromacs/default.nix

+6 −4
Original line number Diff line number Diff line
@@ -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; {

pkgs/applications/science/molecular-dynamics/gromacs/pkgconfig.patch

0 → 100644
+24 −0
Original line number Diff line number Diff line 
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