summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2021-07-16 16:42:31 +0200
committerVladimír Čunát <v@cunat.cz>2021-07-16 16:42:31 +0200
commitb8130cbd64a3c1107a4bc9a5499564a13a644885 (patch)
tree1014c1cf489b61beb41831b233f1056d802b416d
parent6a10c72d90a50e73171a8b9963a67407962e1c16 (diff)
downloadnixpkgs-b8130cbd64a3c1107a4bc9a5499564a13a644885.tar
nixpkgs-b8130cbd64a3c1107a4bc9a5499564a13a644885.tar.gz
nixpkgs-b8130cbd64a3c1107a4bc9a5499564a13a644885.tar.bz2
nixpkgs-b8130cbd64a3c1107a4bc9a5499564a13a644885.tar.lz
nixpkgs-b8130cbd64a3c1107a4bc9a5499564a13a644885.tar.xz
nixpkgs-b8130cbd64a3c1107a4bc9a5499564a13a644885.tar.zst
nixpkgs-b8130cbd64a3c1107a4bc9a5499564a13a644885.zip
Revert "zig: add upstream patch to allow glibc 2.33 builds"
This reverts commit c1d014a975d58112ca678745eb3af5e1206fe1ea.
The patch was included in 0.8.0 and now was failing to apply.
-rw-r--r--pkgs/development/compilers/zig/default.nix9
1 files changed, 0 insertions, 9 deletions
diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix
index 9a01373cf2b..60ca574f1cc 100644
--- a/pkgs/development/compilers/zig/default.nix
+++ b/pkgs/development/compilers/zig/default.nix
@@ -4,7 +4,6 @@
 , llvmPackages
 , libxml2
 , zlib
-, fetchpatch
 }:
 
 let
@@ -21,14 +20,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-bILjcKX8jPl2n1HRYvYRb7jJkobwqmSJ+hHXSn9n2ag=";
   };
 
-  patches = [
-    # glibc 2.33 support
-    (fetchpatch {
-      url = "https://github.com/ziglang/zig/commit/0fee4b55a8c58791238efe6bf2da5ce3435a5cc1.patch";
-      sha256 = "sha256-waVtolUlmGrfiRk4tWsSOij5MfUc+g57DatC6GtSx6c=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     llvmPackages.llvm.dev