diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-11 14:05:34 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-13 17:35:54 +0200 |
| commit | 2be774ccfa90696e6e798928c5cf253de38e9e00 (patch) | |
| tree | 463f98061c83327b6e782051dcb8aa0ac812863c /nixos/modules/installer | |
| parent | a02e5a7fb25b456b7c284d5830dbea3a2b34e5d5 (diff) | |
| download | nixlib-2be774ccfa90696e6e798928c5cf253de38e9e00.tar nixlib-2be774ccfa90696e6e798928c5cf253de38e9e00.tar.gz nixlib-2be774ccfa90696e6e798928c5cf253de38e9e00.tar.bz2 nixlib-2be774ccfa90696e6e798928c5cf253de38e9e00.tar.lz nixlib-2be774ccfa90696e6e798928c5cf253de38e9e00.tar.xz nixlib-2be774ccfa90696e6e798928c5cf253de38e9e00.tar.zst nixlib-2be774ccfa90696e6e798928c5cf253de38e9e00.zip | |
Set .version-suffix properly when building from Git
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 8734cb273d49..0a199fb15421 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -157,10 +157,10 @@ fi # Update the version suffix if we're building from Git (so that # nixos-version shows something useful). -if nixos=$(nix-instantiate --find-file nixos "${extraBuildFlags[@]}"); then - suffix=$(@shell@ $nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}") +if nixpkgs=$(nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then + suffix=$(@shell@ $nixpkgs/nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}") if [ -n "$suffix" ]; then - echo -n "$suffix" > "$nixos/.version-suffix" || true + echo -n "$suffix" > "$nixpkgs/.version-suffix" || true fi fi |