diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-17 12:01:24 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-17 12:01:24 +0000 |
commit | 969a1796ef2433707a52cb128de0739b9e272a2e (patch) | |
tree | a491c1d1b01dccd316fee2b8f230277877e156ef /pkgs/development/libraries/physics | |
parent | ab4849492ddab726337e643104096d91323f33e2 (diff) | |
parent | d0f9857448e77df50d1e0b518ba0e835b797532a (diff) | |
download | nixpkgs-969a1796ef2433707a52cb128de0739b9e272a2e.tar nixpkgs-969a1796ef2433707a52cb128de0739b9e272a2e.tar.gz nixpkgs-969a1796ef2433707a52cb128de0739b9e272a2e.tar.bz2 nixpkgs-969a1796ef2433707a52cb128de0739b9e272a2e.tar.lz nixpkgs-969a1796ef2433707a52cb128de0739b9e272a2e.tar.xz nixpkgs-969a1796ef2433707a52cb128de0739b9e272a2e.tar.zst nixpkgs-969a1796ef2433707a52cb128de0739b9e272a2e.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/physics')
-rw-r--r-- | pkgs/development/libraries/physics/applgrid/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 3ed2f24f45f..512398dde9a 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }: +{ lib, stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib, Cocoa }: stdenv.mkDerivation rec { pname = "applgrid"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; # For some reason zlib was only needed after bump to gfortran8 - buildInputs = [ hoppet lhapdf root5 zlib ]; + buildInputs = [ hoppet lhapdf root5 zlib ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; patches = [ ./bad_code.patch |