diff options
author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-01-08 12:09:00 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-08 12:09:00 +0000 |
commit | 1bf5934eeb71e29429b416ec453123a4891df3fe (patch) | |
tree | f985ac54de79d6c924afea01e770e3ac6deba3fd /pkgs | |
parent | fe1bb44eeebda86974b8a83aad532f55232cb28d (diff) | |
parent | 5602d9f3c5c33f9e3fc4be1775157b623cfa049e (diff) | |
download | nixpkgs-1bf5934eeb71e29429b416ec453123a4891df3fe.tar nixpkgs-1bf5934eeb71e29429b416ec453123a4891df3fe.tar.gz nixpkgs-1bf5934eeb71e29429b416ec453123a4891df3fe.tar.bz2 nixpkgs-1bf5934eeb71e29429b416ec453123a4891df3fe.tar.lz nixpkgs-1bf5934eeb71e29429b416ec453123a4891df3fe.tar.xz nixpkgs-1bf5934eeb71e29429b416ec453123a4891df3fe.tar.zst nixpkgs-1bf5934eeb71e29429b416ec453123a4891df3fe.zip |
Merge pull request #209013 from wegank/hepmc3-darwin
hepmc3: unbreak on aarch64-darwin
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/physics/hepmc3/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index 22e60b20aef..027100379bc 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { ] ++ lib.optional withPython python; + # error: invalid version number in 'MACOSX_DEPLOYMENT_TARGET=11.0' + preConfigure = lib.optionalString (stdenv.isDarwin && lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' + MACOSX_DEPLOYMENT_TARGET=10.16 + ''; + cmakeFlags = [ "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}" ] ++ lib.optionals withPython [ @@ -57,7 +62,5 @@ stdenv.mkDerivation rec { homepage = "http://hepmc.web.cern.ch/hepmc/"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } |