host/rootfs: fix pkgsGui for cross compilation

When cross compiling, we don't need to disable systemd for packages
used at build time, and so would require way more overrides.  So only
apply the overlay for the runtime packages.

Signed-off-by: Alyssa Ross <hi@alyssa.is>

1 files changed, 21 insertions, 17 deletions

diff --git a/host/rootfs/default.nix b/host/rootfs/default.nix
index 1bff907..b76f0f6 100644
--- a/host/rootfs/default.nix
+++ b/host/rootfs/default.nix
@@ -21,32 +21,36 @@ pkgs.pkgsStatic.callPackage (
 }:
 
 let
-  inherit (lib) concatMapStringsSep;
+  inherit (lib) concatMapStringsSep optionalAttrs systems;
   inherit (nixosAllHardware.config.hardware) firmware;
 
   start-vm = import ../start-vm {
     config = config // { pkgs = pkgs.pkgsStatic; };
   };
 
-  pkgsGui = pkgs.pkgsMusl.extend (final: super: {
-    libgudev = super.libgudev.overrideAttrs ({ ... }: {
-      # Tests use umockdev, which is not compatible with libudev-zero.
-      doCheck = false;
-    });
+  pkgsGui = pkgs.pkgsMusl.extend (
+    final: super:
+    (optionalAttrs (systems.equals pkgs.pkgsMusl.stdenv.hostPlatform super.stdenv.hostPlatform) {
+      libgudev = super.libgudev.overrideAttrs ({ ... }: {
+        # Tests use umockdev, which is not compatible with libudev-zero.
+        doCheck = false;
+      });
 
-    systemd = final.libudev-zero;
-    systemdMinimal = final.libudev-zero;
+      systemd = final.libudev-zero;
+      systemdLibs = final.libudev-zero;
+      systemdMinimal = final.libudev-zero;
 
-    seatd = super.seatd.override {
-      systemdSupport = false;
-    };
+      seatd = super.seatd.override {
+        systemdSupport = false;
+      };
 
-    weston = super.weston.overrideAttrs ({ mesonFlags ? [], ... }: {
-      mesonFlags = mesonFlags ++ [
-        "-Dsystemd=false"
-      ];
-    });
-  });
+      weston = super.weston.overrideAttrs ({ mesonFlags ? [], ... }: {
+        mesonFlags = mesonFlags ++ [
+          "-Dsystemd=false"
+        ];
+      });
+    })
+  );
 
   foot = pkgsGui.foot.override { allowPgo = false; };