diff options
| author | maralorn <malte.brandy@maralorn.de> | 2022-03-25 16:32:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-25 16:32:14 +0100 |
| commit | 0e0bb200ff2028432d56f710213873f7dd3d345b (patch) | |
| tree | b3a8aa3cb564bfd077a3ef22ba4fb647a6b90666 /pkgs/development/libraries | |
| parent | 974af506015178f75768d486f4372a12e6a92578 (diff) | |
| parent | a6bc988f00aab57694d8db53284617a34a7f8d61 (diff) | |
| download | nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.tar nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.tar.gz nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.tar.bz2 nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.tar.lz nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.tar.xz nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.tar.zst nixpkgs-0e0bb200ff2028432d56f710213873f7dd3d345b.zip | |
Merge pull request #165327 from ncfavier/fetchpatch-relative
fetchpatch: add `preIncludes` and `relative`
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/CGAL/4.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 4 |
2 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix index 7380a85248f..9c0305ec077 100644 --- a/pkgs/development/libraries/CGAL/4.nix +++ b/pkgs/development/libraries/CGAL/4.nix @@ -18,18 +18,14 @@ stdenv.mkDerivation rec { (fetchpatch { name = "gcc-12-prereq.patch"; url = "https://github.com/CGAL/cgal/commit/4581f1b7a8e97d1a136830e64b77cdae3546c4bf.patch"; - sha256 = "1gzrvbrwxylv80v0m3j2s1znlysmr69lp3ggagnh38lp6423i6pq"; - # Upstream slightly reordered directory structure since. - stripLen = 1; - # Fill patch does not apply: touches too many parts of the source. - includes = [ "include/CGAL/CORE/BigFloatRep.h" ]; + relative = "CGAL_Core"; # Upstream slightly reordered directory structure since. + sha256 = "sha256-4+7mzGSBwAv5RHBQPAecPPKNN/LQBgvYq5mq+fHAteo="; }) (fetchpatch { name = "gcc-12.patch"; url = "https://github.com/CGAL/cgal/commit/6680a6e6f994b2c5b9f068eb3014d12ee1134d53.patch"; - sha256 = "1c0h1lh8zng60yx78qc8wx714b517mil8mac87v6xr21q0b11wk7"; - # Upstream slightly reordered directory structure since. - stripLen = 1; + relative = "CGAL_Core"; # Upstream slightly reordered directory structure since. + sha256 = "sha256-8kxJDT47jXI9kQNFI/ARWl9JBNS4AfU57/D0tYlgW0M="; }) ]; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 8084065ce06..c0fce3ae576 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -137,10 +137,8 @@ stdenv.mkDerivation { ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch ++ optional (version == "1.77.0") (fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; + relative = "include"; sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; - stripLen = 2; - extraPrefix = ""; - includes = [ "boost/math/special_functions/detail/bernoulli_details.hpp" ]; }); meta = { |