From d203c3f1e26a247e82fe97453f60c70397bbdfc0 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Thu, 6 Jun 2024 20:24:56 -0700 Subject: [PATCH 1/2] zig: 0.12.0 -> 0.12.1 --- pkgs/development/compilers/zig/0.12/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/zig/0.12/default.nix b/pkgs/development/compilers/zig/0.12/default.nix index 831366419a93..57de15bb8cd5 100644 --- a/pkgs/development/compilers/zig/0.12/default.nix +++ b/pkgs/development/compilers/zig/0.12/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zig"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig"; rev = finalAttrs.version; - hash = "sha256-RNZiUZtaKXoab5kFrDij6YCAospeVvlLWheTc3FGMks="; + hash = "sha256-C56jyVf16Co/XCloMLSRsbG9r/gBc8mzCdeEMHV2T2s="; }; nativeBuildInputs = [ From 623e23e25f85fdcb78793e65a31569a5a697756d Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Fri, 14 Jun 2024 23:13:57 -0700 Subject: [PATCH 2/2] zig_0_12: unbreak clang builds --- pkgs/development/compilers/zig/0.12/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/zig/0.12/default.nix b/pkgs/development/compilers/zig/0.12/default.nix index 57de15bb8cd5..092b416c7903 100644 --- a/pkgs/development/compilers/zig/0.12/default.nix +++ b/pkgs/development/compilers/zig/0.12/default.nix @@ -56,7 +56,9 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; - strictDeps = true; + # strictDeps breaks zig when clang is being used. + # https://github.com/NixOS/nixpkgs/issues/317055#issuecomment-2148438395 + strictDeps = !stdenv.cc.isClang; # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't # work in Nix's sandbox. Use env from our coreutils instead.