From 4a160e62593ff10739126dcfcae64acf60d4d0a7 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 20 Jun 2020 20:05:41 -0400 Subject: [PATCH] Update cross-hacks for unstable compatibility --- cross-hacks.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cross-hacks.nix b/cross-hacks.nix index 77fb3ad..0b4d87a 100644 --- a/cross-hacks.nix +++ b/cross-hacks.nix @@ -7,6 +7,9 @@ (self: super: { # Does not cross-compile... alsa-firmware = pkgs.runCommandNoCC "neutered-firmware" {} "mkdir -p $out"; + + # A "regression" in nixpkgs, where python3 pycryptodome does not cross-compile. + crda = pkgs.runCommandNoCC "neutered-firmware" {} "mkdir -p $out"; }) ]; @@ -23,4 +26,8 @@ # `xterm` is being included even though this is GUI-less. # → https://github.com/NixOS/nixpkgs/pull/62852 services.xserver.desktopManager.xterm.enable = lib.mkForce false; + + # ec6224b6cd147943eee685ef671811b3683cb2ce re-introduced udisks in the installer + # udisks fails due to gobject-introspection being not cross-compilation friendly. + services.udisks2.enable = lib.mkForce false; }