diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-06-29 08:08:39 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-06-29 08:08:39 +0000 |
| commit | fbcbdf9508da42e8ba0eb741dca3f29ceadec245 (patch) | |
| tree | 6921f0f4618a2038612144e6d4c767bb45208091 /img | |
| parent | 0fd594e6a814f007bfbed4e9a819833989128b6f (diff) | |
| download | spectrum-fbcbdf9508da42e8ba0eb741dca3f29ceadec245.tar spectrum-fbcbdf9508da42e8ba0eb741dca3f29ceadec245.tar.gz spectrum-fbcbdf9508da42e8ba0eb741dca3f29ceadec245.tar.bz2 spectrum-fbcbdf9508da42e8ba0eb741dca3f29ceadec245.tar.lz spectrum-fbcbdf9508da42e8ba0eb741dca3f29ceadec245.tar.xz spectrum-fbcbdf9508da42e8ba0eb741dca3f29ceadec245.tar.zst spectrum-fbcbdf9508da42e8ba0eb741dca3f29ceadec245.zip | |
img/installer: use a path for services.cage.program
This allows us to drop a Nixpkgs patch. It doesn't seem like anything about the installer requires it to be installed globally at the moment. Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'img')
| -rw-r--r-- | img/installer/configuration.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/img/installer/configuration.nix b/img/installer/configuration.nix index b403d45..06878e0 100644 --- a/img/installer/configuration.nix +++ b/img/installer/configuration.nix @@ -31,7 +31,8 @@ in fileSystems."/" = { fsType = "tmpfs"; }; services.cage.enable = true; - services.cage.program = "gnome-image-installer"; + services.cage.program = + "${pkgs.callPackage ./app {}}/bin/gnome-image-installer"; users.users.demo = { group = "demo"; isSystemUser = true; }; users.groups.demo = {}; security.polkit.extraConfig = readFile ./seat.rules; @@ -44,10 +45,7 @@ in boot.loader.systemd-boot.enable = true; - environment.systemPackages = with pkgs; [ - (callPackage ./app { }) - gnome.adwaita-icon-theme - ]; + environment.systemPackages = with pkgs; [ gnome.adwaita-icon-theme ]; systemd.tmpfiles.rules = [ "L+ /var/lib/eos-image-defaults/vendor-customer-support.ini - - - - ${app/vendor-customer-support.ini}" |