mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
openmm: use gcc11Stdenv everywhere
This commit is contained in:
parent
b73601f559
commit
c884849a3c
@ -78,6 +78,9 @@ stdenv.mkDerivation rec {
|
||||
"-DCMAKE_LIBRARY_PATH=${cudaPackages.cudatoolkit}/lib64/stubs"
|
||||
];
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/201254
|
||||
NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc";
|
||||
|
||||
postInstall = lib.strings.optionalString enablePython ''
|
||||
export OPENMM_LIB_PATH=$out/lib
|
||||
export OPENMM_INCLUDE_PATH=$out/include
|
||||
|
@ -31760,8 +31760,8 @@ with pkgs;
|
||||
open-policy-agent = callPackage ../development/tools/open-policy-agent { };
|
||||
|
||||
openmm = callPackage ../development/libraries/science/chemistry/openmm {
|
||||
stdenv = if stdenv.targetPlatform.isAarch64 then gcc9Stdenv else gcc11Stdenv;
|
||||
gfortran = if stdenv.targetPlatform.isAarch64 then gfortran9 else gfortran11;
|
||||
stdenv = gcc11Stdenv;
|
||||
gfortran = gfortran11;
|
||||
};
|
||||
|
||||
openshift = callPackage ../applications/networking/cluster/openshift { };
|
||||
|
Loading…
Reference in New Issue
Block a user