1
0
Fork 0

Nom workaround

This commit is contained in:
Malte Brandy 2021-07-05 18:19:43 +02:00
parent e98b000787
commit 94820a6334
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
2 changed files with 3 additions and 3 deletions

View file

@ -37,9 +37,9 @@ in
say "Building ~/.modes for ${hostName}"
nixPath <- myNixPath "${configPath}"
setEnv "WITH_SECRETS" "false"
nom_build nixPath (params ++ remoteBuildParams)
nix_build nixPath (params ++ remoteBuildParams) &!> StdOut |> nom
setEnv "WITH_SECRETS" "true"
nom_build nixPath params
nix_build nixPath params &!> StdOut |> nom
activate_mode
'';
quickUpdateMode = pkgs.writeHaskellScript

View file

@ -12,7 +12,7 @@ in
paths <- myNixPath "${configPath}"
args <- getArgs
setEnv "WITH_SECRETS" "false"
nom_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args)
nix_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args) &!> StdOut |> nom
setEnv "WITH_SECRETS" "true"
oldSystem <- readlink "-f" "/run/current-system" |> captureTrim
nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) &!> StdOut |> nom