From a203987d72540df7c375985b792c07e39f7b7d3b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 29 Jun 2024 10:33:38 -0400 Subject: [PATCH 1/5] clipbuzz: use zig from buildPackages --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c202166f41a8..ae448329e4ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14556,7 +14556,7 @@ with pkgs; clipboard-jh = callPackage ../tools/misc/clipboard-jh { }; clipbuzz = callPackage ../tools/misc/clipbuzz { - zig = zig_0_12; + zig = buildPackages.zig_0_12; }; xclip = callPackage ../tools/misc/xclip { }; From 1d64220c335e6f4bdb294e70708e925576dfcd4f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 29 Jun 2024 10:33:56 -0400 Subject: [PATCH 2/5] cargo-lambda: use zig from buildPackages --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae448329e4ae..83b6cdcfa55d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16569,7 +16569,7 @@ with pkgs; }; cargo-insta = callPackage ../development/tools/rust/cargo-insta { }; cargo-lambda = callPackage ../development/tools/rust/cargo-lambda { - zig = zig_0_12; + zig = buildPackages.zig_0_12; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; From f22a643625e9f42883c602e26f470cb5a95a4191 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 29 Jun 2024 10:34:17 -0400 Subject: [PATCH 3/5] cargo-zigbuild: use zig from buildPackages --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83b6cdcfa55d..c55c8ad517e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16636,7 +16636,7 @@ with pkgs; cargo-public-api = callPackage ../development/tools/rust/cargo-public-api { }; cargo-zigbuild = callPackage ../development/tools/rust/cargo-zigbuild { - zig = zig_0_12; + zig = buildPackages.zig_0_12; }; cauwugo = callPackage ../development/tools/rust/cauwugo { }; From 58f3c9e95936ecc6e238b8099b9c1e6cec21ea54 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 29 Jun 2024 10:34:30 -0400 Subject: [PATCH 4/5] backlight-auto: use zig from buildPackages --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c55c8ad517e4..81b8ad7f5e1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19979,7 +19979,7 @@ with pkgs; babl = callPackage ../development/libraries/babl { }; backlight-auto = callPackage ../by-name/ba/backlight-auto/package.nix { - zig = zig_0_11; + zig = buildPackages.zig_0_11; }; backward-cpp = callPackage ../development/libraries/backward-cpp { }; From c78f81fdb95d2bf1f30a15e8285f644c4e9259f1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 29 Jun 2024 10:34:47 -0400 Subject: [PATCH 5/5] ncdu: use zig from buildPackages --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81b8ad7f5e1e..65c17ccdd765 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33156,7 +33156,7 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; ncdu = callPackage ../tools/misc/ncdu { - zig = zig_0_12; + zig = buildPackages.zig_0_12; }; ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };