movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

Set .version-suffix properly when building from Git

Browse source
This commit is contained in:
Eelco Dolstra 2013-10-11 14:05:34 +02:00
parent a02e5a7fb2
commit 2be774ccfa
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/installer/tools/nixos-rebuild.sh
View file

@ -157,10 +157,10 @@ fi
# Update the version suffix if we're building from Git (so that # Update the version suffix if we're building from Git (so that
# nixos-version shows something useful). # nixos-version shows something useful).
if nixos=$(nix-instantiate --find-file nixos "${extraBuildFlags[@]}"); then if nixpkgs=$(nix-instantiate --find-file nixpkgs "${extraBuildFlags[@]}"); then
suffix=$(@shell@ $nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}") suffix=$(@shell@ $nixpkgs/nixos/modules/installer/tools/get-version-suffix "${extraBuildFlags[@]}")
if [ -n "$suffix" ]; then if [ -n "$suffix" ]; then
echo -n "$suffix" > "$nixos/.version-suffix" || true echo -n "$suffix" > "$nixpkgs/.version-suffix" || true
fi fi
fi fi