treewide: fix build of various zig packages after breakage in e20232eab (#488420)

This commit is contained in:
Adam C. Stephens
2026-02-08 19:57:26 +00:00
committed by GitHub
14 changed files with 14 additions and 16 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-W6ltmWCw7jfiTiNlh60YVF7mz//8s+bgu4F9gy5cDgw=";
};
postUnpack = ''
postConfigure = ''
ln -s ${
zig_0_14.fetchDeps {
inherit (finalAttrs)
+1 -1
View File
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
})
];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+1 -1
View File
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation {
zigBuildFlags = [ "--release=fast" ];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+1 -1
View File
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
libz
];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+1 -1
View File
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
tag = "v${finalAttrs.version}";
hash = "sha256-868FK3wr/fjXzrQJ4YVDBvzNuX818lufEx/K0fvJdWo=";
};
postPatch = ''
postConfigure = ''
ln -s ${
callPackage ./build.zig.zon.nix {
zig = zig_0_15;
+1 -1
View File
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
zig
];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-OuD5U/T3GuCQrzdhx01NXPSXD7pUAvLnNsznttJogz8=";
};
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-VeB0R/6h9FXSzBfx0IgpGlBz16zQScDSiU7ZvTD/Cds=";
};
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+1 -1
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
]
++ (lib.optionals x11Support [ libxcb ]);
postPatch = ''
postConfigure = ''
ln -s ${
callPackage ./deps.nix {
inherit zig;
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-gCF+CInczBJfDyZgxEQor5C/OSxKciCu9gbZanaE/nA=";
};
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
@@ -59,8 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
]
++ lib.optional xwaylandSupport libx11;
dontConfigure = true;
zigBuildFlags = [
"--system"
"${finalAttrs.deps}"
+1 -1
View File
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
zig
];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
zig
];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
+2 -2
View File
@@ -40,7 +40,7 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension))
nativeBuildInputs = [ zig_0_14 ];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps_0_14.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
};
@@ -58,7 +58,7 @@ lib.mapAttrs (_: extension: stdenv.mkDerivation (lib.extends common extension))
nativeBuildInputs = [ zig_0_15 ];
postPatch = ''
postConfigure = ''
ln -s ${callPackage ./deps_0_15.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
'';
};