manuth/NixOSConfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove redundancies

Browse source
This commit is contained in:
Manuel Thalmann 2024-05-01 00:43:41 +02:00
parent 690b33bd08
commit 467b2036a7
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/config/custom-build-vm.nix
View file

@ -40,16 +40,17 @@
(item: { inherit (item) file value; })); (item: { inherit (item) file value; }));
in in
lib.mkForce ( lib.mkForce (
if (mergedSystem.mergedValue.vm.name == packageName) with { inherit (mergedSystem.mergedValue) vm; };
if (vm.name == packageName)
then then
mergedSystem.mergedValue.vm vm
else else
let let
prefix = lib.concatStringsSep " " (lib.optional config.virtualisation.runAsRoot "sudo"); prefix = lib.concatStringsSep " " (lib.optional config.virtualisation.runAsRoot "sudo");
wrapped = pkgs.writeShellApplication { wrapped = pkgs.writeShellApplication {
name = "run-${config.system.name}-vm"; name = "run-${config.system.name}-vm";
text = '' text = ''
${prefix} ${mergedSystem.mergedValue.vm}/bin/run-${config.system.name}-vm ${prefix} ${vm}/bin/run-${config.system.name}-vm
''; '';
}; };
in in