wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 12:41:15 +02:00
Code Activity

nix upgrade-nix: Fix build on mingw

Browse source
This commit is contained in:
Eelco Dolstra 2025-01-20 16:06:55 +01:00
parent 89e5047e12
commit 2cb494f561
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/nix/upgrade-nix.cc
View file

@ -97,7 +97,7 @@ struct CmdUpgradeNix : MixDryRun, StoreCommand
// FIXME: don't call an external process. // FIXME: don't call an external process.
runProgram(getNixBin("nix-env").string(), false, runProgram(getNixBin("nix-env").string(), false,
{"--profile", profileDir, "-i", store->printStorePath(storePath), "--no-sandbox"}); {"--profile", profileDir.string(), "-i", store->printStorePath(storePath), "--no-sandbox"});
} }
printInfo(ANSI_GREEN "upgrade to version %s done" ANSI_NORMAL, version); printInfo(ANSI_GREEN "upgrade to version %s done" ANSI_NORMAL, version);
@ -120,7 +120,7 @@ struct CmdUpgradeNix : MixDryRun, StoreCommand
// Resolve profile to /nix/var/nix/profiles/<name> link. // Resolve profile to /nix/var/nix/profiles/<name> link.
while (canonPath(profileDir.string()).find("/profiles/") == std::string::npos && std::filesystem::is_symlink(profileDir)) while (canonPath(profileDir.string()).find("/profiles/") == std::string::npos && std::filesystem::is_symlink(profileDir))
profileDir = readLink(profileDir); profileDir = readLink(profileDir.string());
printInfo("found profile %s", profileDir); printInfo("found profile %s", profileDir);