Revert "flake: build blender-hip for system"
This reverts commit 86d05ade2a
.
This commit is contained in:
parent
86d05ade2a
commit
724c1d644d
10
flake.nix
10
flake.nix
|
@ -14,12 +14,12 @@
|
|||
let
|
||||
inherit (nixpkgs) lib;
|
||||
|
||||
nixosSystem' = { extraStuff ? true }: nixpkgs.lib.nixosSystem {
|
||||
nixosSystem' = nixpkgs: nixpkgs.lib.nixosSystem {
|
||||
modules = [
|
||||
"${jovian}/modules"
|
||||
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix"
|
||||
|
||||
({ config, pkgs, ... }: {
|
||||
({ config, ... }: {
|
||||
# avoid asserts ...
|
||||
boot.loader.grub.devices = [ "/dev/sda" ];
|
||||
fileSystems."/".device = "/dev/sda1";
|
||||
|
@ -46,8 +46,6 @@
|
|||
hardware.pulseaudio.enable = lib.mkIf
|
||||
(config.jovian.devices.steamdeck.enableSoundSupport && config.services.pipewire.enable)
|
||||
(lib.mkForce false);
|
||||
|
||||
environment.systemPackages = lib.mkIf extraStuff (with pkgs; [ blender-hip ]);
|
||||
})
|
||||
];
|
||||
|
||||
|
@ -55,10 +53,10 @@
|
|||
};
|
||||
in
|
||||
{
|
||||
nixosConfigurations.jovian = nixosSystem' { };
|
||||
nixosConfigurations.jovian = nixosSystem' nixpkgs;
|
||||
|
||||
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;
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue