diff --git a/flake.nix b/flake.nix index a833f63..8b343d6 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ extraModules = [ ./zynq_image.nix ]; + platform = system: platforms.armv7l-hf-multiplatform; system = "x86_64-linux"; crossSystem.system = "armv7l-linux"; inherit (not-os.inputs) nixpkgs; diff --git a/linux_zynq.nix b/linux_zynq.nix deleted file mode 100644 index 66ec23c..0000000 --- a/linux_zynq.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, buildLinux, ... } @ args: - -let - modDirVersion = "6.1.0-xilinx"; -in -lib.overrideDerivation (buildLinux (args // { - version = "${modDirVersion}"; - inherit modDirVersion; - - src = fetchFromGitHub { - owner = "Xilinx"; - repo = "linux-xlnx"; - rev = "c8b3583bc86352009c6ac61e2ced0e12118f8ebb"; - sha256 = "09vfh2p7iszzjqp25fnwpzy52h07v4n161salsia0jyr2g5kxrfr"; - }; - - defconfig = "xilinx_zynq_defconfig"; - -} // (args.argsOverride or {}))) (oldAttrs: {}) diff --git a/zynq_image.nix b/zynq_image.nix index 470b842..6739896 100644 --- a/zynq_image.nix +++ b/zynq_image.nix @@ -6,22 +6,9 @@ let # dont use overlays for the qemu, it causes a lot of wasted time on recompiles x86pkgs = import pkgs.path { system = "x86_64-linux"; }; # armv7l cross-compile and boot fixes - customKernel = pkgs.linux_zynq.override { + customKernel = pkgs.linux.override { extraConfig = '' OVERLAY_FS y - DRM_XLNX_HDCP n - DRM_XLNX_DPTX n - DRM_XLNX_HDMITX n - VIDEO_XILINX_HDCP2X_RX n - VIDEO_XILINX_DPRXSS n - DRM_XLNX n - USB_XHCI_PLATFORM n - USB_XHCI_HCD n - SENSORS_TPS544 n - XLNX_TSMUX n - USB_BRCMSTB n - MEDIA_SUPPORT n - SOUND n ''; }; customKernelPackages = pkgs.linuxPackagesFor customKernel; @@ -80,20 +67,11 @@ in { ''; environment.etc."pam.d/other".text = ""; - nixpkgs.config.packageOverrides = pkgs: { - linux_zynq = pkgs.callPackage ./linux_zynq.nix {}; - }; - nixpkgs.overlays = [ (self: super: { # armv7l cross-compile fixes - libuv = super.libuv.overrideAttrs (old: { - doCheck = false; - }); - elfutils = super.elfutils.overrideAttrs (old: { - doCheck = false; - doInstallCheck = false; - }); + libuv = super.libuv.overrideAttrs (old: { doCheck = false;}); + elfutils = super.elfutils.overrideAttrs (old: { doCheck = false; doInstallCheck = false;}); systemd = super.systemd.override { withEfi = false; }; procps = super.procps.override { withSystemd = false; }; nix = super.nix.override { enableDocumentation = false; };