From ee2caee2d15b8e8ac0830aba603f58102f2f0ab4 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 20 Jun 2020 20:05:41 -0400
Subject: [PATCH] cross-hacks: Update for nixos-unstable

---
 cross-hacks.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/cross-hacks.nix b/cross-hacks.nix
index 77fb3ad..6a70f75 100644
--- a/cross-hacks.nix
+++ b/cross-hacks.nix
@@ -7,6 +7,25 @@
     (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";
+    })
+
+    (final: super:
+      let
+        pkgconfig-helper = final.writeShellScriptBin "pkg-config" ''         
+          exec ${super.buildPackages.pkgconfig}/bin/${super.buildPackages.pkgconfig.targetPrefix}pkg-config "$@"
+        '';                                                                                
+      in
+      {
+        efibootmgr = super.efibootmgr
+        .overrideAttrs(old: {
+          nativeBuildInputs = old.nativeBuildInputs ++ [
+            pkgconfig-helper
+          ];
+        })
+        ;
     })
   ];
 
@@ -23,4 +42,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;
 }