Commit 68b5fdce authored by Jörg Thalheim's avatar Jörg Thalheim
Browse files

treewide: zig packages: move dep linking to postConfigure

Commit e20232ea moved ZIG_GLOBAL_CACHE_DIR setup from an
addEnvHooks call into zigConfigurePhase. This broke all zig packages
that referenced $ZIG_GLOBAL_CACHE_DIR in postPatch or postUnpack,
since that variable is no longer set until configurePhase runs.

Move the symlink creation to postConfigure for all affected packages.
parent b1a6d54b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-W6ltmWCw7jfiTiNlh60YVF7mz//8s+bgu4F9gy5cDgw=";
  };

  postUnpack = ''
  postConfigure = ''
    ln -s ${
      zig_0_14.fetchDeps {
        inherit (finalAttrs)
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
    })
  ];

  postPatch = ''
  postConfigure = ''
    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
  '';

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation {

  zigBuildFlags = [ "--release=fast" ];

  postPatch = ''
  postConfigure = ''
    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
  '';

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
    libz
  ];

  postPatch = ''
  postConfigure = ''
    ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
  '';

+1 −1
Original line number Diff line number Diff line
@@ -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;
Loading