diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-03-26 09:52:52 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-03-26 09:56:00 -0400 |
| commit | 8ac9b31afbde2f28fbe6fec64a64e85624b91d8a (patch) | |
| tree | de7161560c313f7c80a64e9894fbdeb120de61b8 | |
| parent | 8eb359be153cbefcffc8408bd30bcd369bd5d793 (diff) | |
| download | nixpkgs-8ac9b31afbde2f28fbe6fec64a64e85624b91d8a.tar nixpkgs-8ac9b31afbde2f28fbe6fec64a64e85624b91d8a.tar.gz nixpkgs-8ac9b31afbde2f28fbe6fec64a64e85624b91d8a.tar.bz2 nixpkgs-8ac9b31afbde2f28fbe6fec64a64e85624b91d8a.tar.lz nixpkgs-8ac9b31afbde2f28fbe6fec64a64e85624b91d8a.tar.xz nixpkgs-8ac9b31afbde2f28fbe6fec64a64e85624b91d8a.tar.zst nixpkgs-8ac9b31afbde2f28fbe6fec64a64e85624b91d8a.zip | |
rivet: fix compilation errors
| -rw-r--r-- | pkgs/development/libraries/physics/rivet/default.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 5257f4b89d3..44065904d99 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -12,6 +12,18 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch # configure relies on impure sw_vers to -Dunix + # fix compilation errors (fails depending on number of cores filesystem ordering?) + # https://gitlab.com/hepcedar/rivet/-/merge_requests/220 + (fetchpatch { + url = "https://gitlab.com/hepcedar/rivet/commit/3203bf12a4bef81f880789eb9cde7ff489ae5115.diff"; + sha256 = "0zn5yxlv6dk4vcqgz0syzb9mp4qc9smpmgshcqimcvii7qcp20mc"; + }) + # https://gitlab.com/hepcedar/rivet/-/merge_requests/223 + (fetchpatch { + url = "https://gitlab.com/hepcedar/rivet/commit/476f267c46b126fa163a92aa6cbcb7806c4624c3.diff"; + sha256 = "0dhkraddzp06v5z0d2wf0c8vsd50hl5pqsjgsrb8x14d0vwi8rnc"; + }) + # fix for new python and fix transparency gs 9.52 # gs 9.52 opacity fix (fetchpatch { |