diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2019-11-27 22:57:50 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-11-27 22:57:50 -0800 |
| commit | 0c1c18ca4416baa46c940960aa5e619873a2318e (patch) | |
| tree | 78d7fd3eb63e91fa99267e2d91a2a891ee29f567 /pkgs/development/libraries/physics | |
| parent | 4cc592761db580855b47fb84776e68b1d936521c (diff) | |
| parent | f4f816902112778172565baf91c2483186027c3b (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/libraries/physics')
| -rw-r--r-- | pkgs/development/libraries/physics/applgrid/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index edda5148068a..3e2a53d81dd8 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5 }: +{ stdenv, fetchurl, gfortran, hoppet, lhapdf, root5, zlib }: stdenv.mkDerivation rec { pname = "applgrid"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p"; }; - buildInputs = [ gfortran hoppet lhapdf root5 ]; + # For some reason zlib was only needed after bump to gfortran8 + buildInputs = [ gfortran hoppet lhapdf root5 zlib ]; patches = [ ./bad_code.patch |