Compare commits
3 commits
966d88f2ba
...
c62e6901a9
Author | SHA1 | Date | |
---|---|---|---|
c62e6901a9 | |||
ecfe787bca | |||
5ced0ad3b2 |
3 changed files with 3 additions and 2 deletions
|
@ -38,6 +38,7 @@ self = {
|
||||||
{
|
{
|
||||||
config.nixpkgs.overlays = [
|
config.nixpkgs.overlays = [
|
||||||
( import ./pkgs/overlays/selfExpr.nix { nixpkgsPath = "${builtins.toString ./.}/pkgs/top-level/impure.nix"; } )
|
( import ./pkgs/overlays/selfExpr.nix { nixpkgsPath = "${builtins.toString ./.}/pkgs/top-level/impure.nix"; } )
|
||||||
|
( import "${inputs.nixpkgs}/pkgs/top-level/by-name-overlay.nix" "${builtins.toString ./.}/pkgs/by-name" )
|
||||||
self.overlays.versionInfoFixup
|
self.overlays.versionInfoFixup
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -454,7 +454,7 @@ trap cleanup EXIT
|
||||||
# Re-execute nixos-rebuild from the Nixpkgs tree.
|
# Re-execute nixos-rebuild from the Nixpkgs tree.
|
||||||
if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast ]]; then
|
if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast ]]; then
|
||||||
if [[ -z $buildingAttribute ]]; then
|
if [[ -z $buildingAttribute ]]; then
|
||||||
p=$(runCmd nix-build --no-out-link $buildFile -A "${$attr:+$attr.}config.system.build.nixos-rebuild" "${extraBuildFlags[@]}")
|
p=$(runCmd nix-build --no-out-link $buildFile -A "${attr:+$attr.}config.system.build.nixos-rebuild" "${extraBuildFlags[@]}")
|
||||||
SHOULD_REEXEC=1
|
SHOULD_REEXEC=1
|
||||||
elif [[ -z $flake ]]; then
|
elif [[ -z $flake ]]; then
|
||||||
if p=$(runCmd nix-build --no-out-link --expr 'with import <nixpkgs/nixos> {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then
|
if p=$(runCmd nix-build --no-out-link --expr 'with import <nixpkgs/nixos> {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix;
|
fallback = import "${(import ../../../../inputs.nix {}).nixpkgs}/nixos/modules/installer/tools/nix-fallback-paths.nix";
|
||||||
in
|
in
|
||||||
substitute {
|
substitute {
|
||||||
name = "nixos-rebuild";
|
name = "nixos-rebuild";
|
||||||
|
|
Loading…
Reference in a new issue