diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-15 18:01:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 18:01:59 +0000 |
| commit | 1c625bf8446304ff8590d88156a88e958e9dc159 (patch) | |
| tree | eafee5d03d3c037a6a0fcc9e9863f0ac49306ea9 /pkgs/applications/science/physics | |
| parent | 3e8668d9e58acf80f5a074a50a74b40a4ec017dc (diff) | |
| parent | c33a20823056a8120bbf1460ce66347b2bbd80be (diff) | |
| download | nixpkgs-1c625bf8446304ff8590d88156a88e958e9dc159.tar nixpkgs-1c625bf8446304ff8590d88156a88e958e9dc159.tar.gz nixpkgs-1c625bf8446304ff8590d88156a88e958e9dc159.tar.bz2 nixpkgs-1c625bf8446304ff8590d88156a88e958e9dc159.tar.lz nixpkgs-1c625bf8446304ff8590d88156a88e958e9dc159.tar.xz nixpkgs-1c625bf8446304ff8590d88156a88e958e9dc159.tar.zst nixpkgs-1c625bf8446304ff8590d88156a88e958e9dc159.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/science/physics')
| -rw-r--r-- | pkgs/applications/science/physics/xfitter/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 230f2f0e0ef..51d6c9d68fe 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, lapack, libyaml, lynx , mela, root5, qcdnum, which, libtirpc +, memorymappingHook, memstreamHook }: stdenv.mkDerivation rec { @@ -36,9 +37,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran which ]; buildInputs = - [ apfel apfelgrid applgrid blas lhapdf lapack mela root5 qcdnum ] - # pdf2yaml requires fmemopen and open_memstream which are not readily available on Darwin - ++ lib.optional (!stdenv.isDarwin) libyaml + [ apfel apfelgrid applgrid blas lhapdf libyaml lapack mela root5 qcdnum ] + ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ] ++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc ; propagatedBuildInputs = [ lynx ]; |