diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-07-17 09:20:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-17 09:20:35 +0100 |
| commit | a13c5683649f7b68a95094a432ea8e5150ef7923 (patch) | |
| tree | 1a91067c2f54b6ba71ebb82094a46cdc3e866c71 /pkgs/development/compilers | |
| parent | 62b7217ee2c945963e1af942f6745d7470d7f3b8 (diff) | |
| parent | 08846decc930d81c97f6ca9b5442c14db721ef92 (diff) | |
| download | nixpkgs-a13c5683649f7b68a95094a432ea8e5150ef7923.tar nixpkgs-a13c5683649f7b68a95094a432ea8e5150ef7923.tar.gz nixpkgs-a13c5683649f7b68a95094a432ea8e5150ef7923.tar.bz2 nixpkgs-a13c5683649f7b68a95094a432ea8e5150ef7923.tar.lz nixpkgs-a13c5683649f7b68a95094a432ea8e5150ef7923.tar.xz nixpkgs-a13c5683649f7b68a95094a432ea8e5150ef7923.tar.zst nixpkgs-a13c5683649f7b68a95094a432ea8e5150ef7923.zip | |
Merge pull request #130425 from Mic92/merge-staging-next
Merge staging-next -> staging
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/zig/default.nix | 9 |
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 |