mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-30 19:02:57 +00:00
Merge pull request #215879 from veprbl/pr/lhapdf_darwin_python_fix
lhapdf: fix python module on darwin
This commit is contained in:
commit
8fbe96924a
@ -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-V0Nc1pXilwZdU+ab0pCQdlyTSTa2qXX/jFWXZvIjA1k=";
|
||||
};
|
||||
|
||||
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) ''
|
||||
|
Loading…
Reference in New Issue
Block a user