From 724c1d644d631a79af0940f497a954e949792c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 30 Apr 2023 16:00:58 +0200 Subject: [PATCH] Revert "flake: build blender-hip for system" This reverts commit 86d05ade2a7ca10d4c3cb39b07e9138e78ad4066. --- flake.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index d8a0472..1a02073 100644 --- a/flake.nix +++ b/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; }; };