diff --git a/cross-hacks.nix b/cross-hacks.nix deleted file mode 100644 index 8836052..0000000 --- a/cross-hacks.nix +++ /dev/null @@ -1,55 +0,0 @@ -# From this upstream repo: -# https://github.com/samueldr/cross-system -{ config, pkgs, lib, ... }: -{ - - nixpkgs.overlays = [ - (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"; - - # Regression caused by including a new package in the closure - # Added in f1922cdbdc608b1f1f85a1d80310b54e89d0e9f3 - smartmontools = super.smartmontools.overrideAttrs(old: { - configureFlags = []; - }); - }) - - (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 - ]; - }) - ; - }) - ]; - - # (Failing build in a dep to be investigated) - security.polkit.enable = false; - - # cifs-utils fails to cross-compile - # Let's simplify this by removing all unneeded filesystems from the image. - boot.supportedFilesystems = lib.mkForce [ "vfat" ]; - - # texinfoInteractive has trouble cross-compiling - documentation.info.enable = lib.mkForce false; - - # `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; -} diff --git a/system.nix b/system.nix deleted file mode 100644 index 975a7b2..0000000 --- a/system.nix +++ /dev/null @@ -1,7 +0,0 @@ -import { - configuration = - if builtins.currentSystem == "aarch64-linux" - then builtins.toPath (./. + "/configuration.nix") - else builtins.toPath (./. + "/with-cross.nix") - ; -} diff --git a/with-cross.nix b/with-cross.nix deleted file mode 100644 index d0e44a3..0000000 --- a/with-cross.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - imports = [ - ./cross-hacks.nix - ./configuration.nix - ]; - - nixpkgs.crossSystem = { - system = "aarch64-linux"; - }; -}