cross-hacks: Update for nixos-unstable

This commit is contained in:
Samuel Dionne-Riel 2020-06-20 20:05:41 -04:00
parent 4d17db81a7
commit ee2caee2d1
1 changed files with 23 additions and 0 deletions

View File

@ -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;
}