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

Merge pull request #8735 from obsidiansystems/defexpr

Browse source 
Factor out `nix-defexpr` path computation
This commit is contained in:
Robert Hensing 2023-08-11 20:32:03 +02:00 • committed by GitHub
commit 584ff408a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/nix-env/nix-env.cc
View file

@ -15,6 +15,7 @@
#include "value-to-json.hh"
#include "xml-writer.hh"
#include "legacy.hh"
#include "eval-settings.hh" // for defexpr
#include <cerrno>
#include <ctime>
@ -1399,7 +1400,7 @@ static int main_nix_env(int argc, char * * argv)
globals.instSource.type = srcUnknown;
globals.instSource.systemFilter = "*";
Path nixExprPath = settings.useXDGBaseDirectories ? createNixStateDir() + "/defexpr" : getHome() + "/.nix-defexpr";
Path nixExprPath = getNixDefExpr();
if (!pathExists(nixExprPath)) {
try {