diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-04-26 13:02:00 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-04-26 17:34:39 +0200 |
| commit | 1d71d2e883e6152dd66f2f7634b7cffc1a7f0584 (patch) | |
| tree | 344a02200f1815e88d1683d48451db4a35169a41 /pkgs/build-support/build-bazel-package | |
| parent | 513e072bcc6f017df85a7db607568616fe53eeb1 (diff) | |
| download | nixpkgs-1d71d2e883e6152dd66f2f7634b7cffc1a7f0584.tar nixpkgs-1d71d2e883e6152dd66f2f7634b7cffc1a7f0584.tar.gz nixpkgs-1d71d2e883e6152dd66f2f7634b7cffc1a7f0584.tar.bz2 nixpkgs-1d71d2e883e6152dd66f2f7634b7cffc1a7f0584.tar.lz nixpkgs-1d71d2e883e6152dd66f2f7634b7cffc1a7f0584.tar.xz nixpkgs-1d71d2e883e6152dd66f2f7634b7cffc1a7f0584.tar.zst nixpkgs-1d71d2e883e6152dd66f2f7634b7cffc1a7f0584.zip | |
buildBazelPackage: never append to fFetchAttrs.installPhase
In f8ee061247b365a98322c102c5bfd900395a826c, the fallback installPhase if fFetchAttrs.installPhase is not provided, became dynamically computed. Due to operator precedence this had the side effect of appending to fFetchAttrs.installPhase if it is provided, breaking custom installPhases altogether.
Diffstat (limited to 'pkgs/build-support/build-bazel-package')
| -rw-r--r-- | pkgs/build-support/build-bazel-package/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index a49d3c781ed..d06b11c8ee0 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation (fBuildAttrs // { runHook postBuild ''; - installPhase = fFetchAttrs.installPhase or '' + installPhase = fFetchAttrs.installPhase or ('' runHook preInstall # Remove all built in external workspaces, Bazel will recreate them when building @@ -183,7 +183,7 @@ stdenv.mkDerivation (fBuildAttrs // { (cd $bazelOut/ && tar czf $out --sort=name --mtime='@1' --owner=0 --group=0 --numeric-owner external/) runHook postInstall - ''; + ''); dontFixup = true; allowedRequisites = []; |