diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2023-02-11 16:13:08 -0500 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2023-02-12 05:19:50 +0000 |
| commit | a54bab9a3d6bb9e35cc85f32537a6b370ac844ad (patch) | |
| tree | 589bd8893d565650f4566d519f96cb597562cbb3 | |
| parent | Merge pull request #215859 from NixOS/backport-215825-to-release-22.11 (diff) | |
| download | nixpkgs-origin/backport-215879-to-release-22.11.tar.gz | |
lhapdf: fix python module on darwinorigin/backport-215879-to-release-22.11
(cherry picked from commit 092a6d7fc7239bb206cf4724efac07f7de2b0275)
| -rw-r--r-- | pkgs/development/libraries/physics/lhapdf/default.nix | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index c26aba66515b..09c08c11b890 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, makeWrapper }: +{ lib, stdenv, fetchurl, fetchpatch, python, makeWrapper }: stdenv.mkDerivation rec { pname = "lhapdf"; @@ -9,6 +9,22 @@ stdenv.mkDerivation rec { sha256 = "sha256-YIonU0VeBnqZQLXBa8hqtsR+LHSbyd0ZeWmW60NSsv0="; }; + patches = [ + # avoid silent compilation failures + (fetchpatch { + name = "lhapdf-propagate_returncode.patch"; + url = "https://gitlab.com/hepcedar/lhapdf/-/commit/2806ac795c7e4a69281d9c2a6a8bba5423f37e74.diff"; + hash = "sha256-j8txlt0n5gpUy9zeuWKx+KRXL3HMMaGcwOxr908966k="; + }) + + # workaround "ld: -stack_size option can only be used when linking a main executable" on darwin + (fetchpatch { + name = "lhapdf-Wl_stack_size.patch"; + url = "https://gitlab.com/hepcedar/lhapdf/-/commit/463764d6613837b6ab57ecaf13bc61be2349e5e4.diff"; + hash = "sha256-AbDs7gtU5HsJG5n/solMzu2bjX1juxfUIqIt5KmNffU="; + }) + ]; + # The Apple SDK only exports locale_t from xlocale.h whereas glibc # had decided that xlocale.h should be a part of locale.h postPatch = lib.optionalString (stdenv.isDarwin && stdenv.cc.isGNU) '' |