summary refs log tree commit diff
path: root/pkgs/tools/system/fakeroot
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2021-05-28 13:13:35 +0200
committerVladimír Čunát <v@cunat.cz>2021-07-06 16:02:34 +0200
commit6e50ffe704be17b6c1497e96ea65c59e9ed10ffa (patch)
tree019fffad331c48df2007eac51687e941abff28d3 /pkgs/tools/system/fakeroot
parent3f5336e15bf72814ae5f8a3dd8a46a997c025ad6 (diff)
downloadnixpkgs-6e50ffe704be17b6c1497e96ea65c59e9ed10ffa.tar
nixpkgs-6e50ffe704be17b6c1497e96ea65c59e9ed10ffa.tar.gz
nixpkgs-6e50ffe704be17b6c1497e96ea65c59e9ed10ffa.tar.bz2
nixpkgs-6e50ffe704be17b6c1497e96ea65c59e9ed10ffa.tar.lz
nixpkgs-6e50ffe704be17b6c1497e96ea65c59e9ed10ffa.tar.xz
nixpkgs-6e50ffe704be17b6c1497e96ea65c59e9ed10ffa.tar.zst
nixpkgs-6e50ffe704be17b6c1497e96ea65c59e9ed10ffa.zip
fakeroot: fix build w/glibc-2.33
Diffstat (limited to 'pkgs/tools/system/fakeroot')
-rw-r--r--pkgs/tools/system/fakeroot/default.nix18
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index 0e4f51c7ea6..bf42e987c4d 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -9,7 +9,23 @@ stdenv.mkDerivation rec {
     sha256 = "1xpl0s2yjyjwlf832b6kbkaa5921liybaar13k7n45ckd9lxd700";
   };
 
-  patches = lib.optional stdenv.isLinux ./einval.patch
+  patches = lib.optionals stdenv.isLinux [
+    ./einval.patch
+
+    # glibc 2.33 patches from ArchLinux
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch";
+      sha256 = "sha256-F6BcxYInSLu7Fxg6OmMZDhTWoLqsc//yYPlTZqQQl68=";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch";
+      sha256 = "sha256-ifpJxhk6MyQpFolC1hIAAUjcHmOHVU1D25tRwpu2S/k=";
+    })
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch";
+      sha256 = "sha256-o2Xm4C64Ny9TL8fjsZltjO1CdJ4VGwqZ+LnufVL5Sq8=";
+    })
+  ]
   # patchset from brew
   ++ lib.optionals stdenv.isDarwin [
     (fetchpatch {