diff options
| author | Weijia Wang | 2023-11-07 03:20:41 +0100 |
|---|---|---|
| committer | GitHub | 2023-11-07 03:20:41 +0100 |
| commit | c97fbef1f3ed7df5cfba7ed0a5c879e0230ffcf7 (patch) | |
| tree | aa2e3ed866eab429b3a9db136b95ba8877980968 /pkgs/applications/science | |
| parent | 4212c65b78d249d59dbf19edcdacf4e5b872f744 (diff) | |
| parent | 5827957a065f32879e479e90b1651564144bc4d3 (diff) | |
Merge pull request #265981 from wegank/root-patches-drop
root: drop patches
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index a03709c1437d..d2172f614f64 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -110,18 +110,6 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch - # glibc >=2.38 already has strlcat implemented. - # merged upstream, remove on next package bump. - (fetchpatch { - url = "https://github.com/root-project/root/commit/8fb0e35446ed67c9d56639b4708c8f05459b7f84.patch"; - hash = "sha256-7EabmYanqlQsYSQsi+S9eWs1v1pY6MncopL420Y3D4w="; - }) - ] ++ lib.optionals (python.pkgs.pythonAtLeast "3.11") [ - # Fix build against Python 3.11 - (fetchpatch { - url = "https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc.patch"; - hash = "sha256-4qur2e3SxMIPgOg4IjlvuULR2BObuP7xdvs+LmNT2/s="; - }) ]; preConfigure = '' |