diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-16 12:53:32 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-16 12:53:32 +0100 |
| commit | 67419f0e56f99b0ebbe14574d3492110ac84c8d6 (patch) | |
| tree | 3abc8e1606a2c80b6f5d14fef175e50800202163 /nixpkgs/pkgs/applications/science/misc/root/default.nix | |
| parent | a2c1eff83c3118a9aee8076c7f84f58137416b6e (diff) | |
| parent | 9008bc4eb62c878d0812105ea1b34255d651df88 (diff) | |
| download | nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.gz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.bz2 nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.lz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.xz nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.tar.zst nixlib-67419f0e56f99b0ebbe14574d3492110ac84c8d6.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs into HEAD
Diffstat (limited to 'nixpkgs/pkgs/applications/science/misc/root/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/science/misc/root/default.nix | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/applications/science/misc/root/default.nix b/nixpkgs/pkgs/applications/science/misc/root/default.nix index a03709c1437d..d2172f614f64 100644 --- a/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/nixpkgs/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 = '' |