public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/nix: ignore nix.checkConfig when cross-compiling (#48225)

Browse Source 
* nixos/nix: ignore nix.checkConfig when cross-compiling

the check always fails because of architecture mismatch

* typos
This commit is contained in:
volth 2018-11-10 01:18:06 +00:00 committed by Matthew Bauer
parent 3f76d76226
commit 5ea22a5b00
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/services/misc/nix-daemon.nix
View File

@ -62,11 +62,15 @@ let
''} ''}
$extraOptions $extraOptions
END END
'' + optionalString cfg.checkConfig '' '' + optionalString cfg.checkConfig (
echo "Checking that Nix can read nix.conf..." if pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform then ''
ln -s $out ./nix.conf echo "Ignore nix.checkConfig when cross-compiling"
NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null '' else ''
''); echo "Checking that Nix can read nix.conf..."
ln -s $out ./nix.conf
NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null
'')
);
in in