c3d2/hydra-jovian
c3d2/hydra-jovian
1
1
Fork 0
Code Issues Pull Requests Releases Activity

Revert "flake: build blender-hip for system"

Browse Source 
This reverts commit 86d05ade2a.
This commit is contained in:
Sandro - 2023-04-30 16:00:58 +02:00
parent 86d05ade2a
commit 724c1d644d
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flake.nix
View File

@ -14,12 +14,12 @@
let let
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
nixosSystem' = { extraStuff ? true }: nixpkgs.lib.nixosSystem { nixosSystem' = nixpkgs: nixpkgs.lib.nixosSystem {
modules = [ modules = [
"${jovian}/modules" "${jovian}/modules"
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix" "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix"
({ config, pkgs, ... }: { ({ config, ... }: {
# avoid asserts ... # avoid asserts ...
boot.loader.grub.devices = [ "/dev/sda" ]; boot.loader.grub.devices = [ "/dev/sda" ];
fileSystems."/".device = "/dev/sda1"; fileSystems."/".device = "/dev/sda1";
@ -46,8 +46,6 @@
hardware.pulseaudio.enable = lib.mkIf hardware.pulseaudio.enable = lib.mkIf
(config.jovian.devices.steamdeck.enableSoundSupport && config.services.pipewire.enable) (config.jovian.devices.steamdeck.enableSoundSupport && config.services.pipewire.enable)
(lib.mkForce false); (lib.mkForce false);
environment.systemPackages = lib.mkIf extraStuff (with pkgs; [ blender-hip ]);
}) })
]; ];
@ -55,10 +53,10 @@
}; };
in in
{ {
nixosConfigurations.jovian = nixosSystem' { }; nixosConfigurations.jovian = nixosSystem' nixpkgs;
hydraJobs = { hydraJobs = {
iso = lib.hydraJob (nixosSystem' { extraStuff = false; }).config.system.build.isoImage; iso = lib.hydraJob self.nixosConfigurations.jovian.config.system.build.isoImage;
system = lib.hydraJob self.nixosConfigurations.jovian.config.system.build.toplevel; system = lib.hydraJob self.nixosConfigurations.jovian.config.system.build.toplevel;
}; };
}; };