mirror of
https://github.com/youwen5/nixos.git
synced 2024-11-25 02:03:51 -08:00
Compare commits
No commits in common. "a47575cfae76e388652c6f9520b98e84bcf9f57b" and "7fb6171dcf1755b7b5543a72bfb96082d5616a02" have entirely different histories.
a47575cfae
...
7fb6171dcf
4 changed files with 5102 additions and 16 deletions
|
@ -1,15 +0,0 @@
|
||||||
diff --git a/src/protocols/LinuxDMABUF.cpp b/src/protocols/LinuxDMABUF.cpp
|
|
||||||
index 0fbf832e..c6077114 100644
|
|
||||||
--- a/src/protocols/LinuxDMABUF.cpp
|
|
||||||
+++ b/src/protocols/LinuxDMABUF.cpp
|
|
||||||
@@ -492,9 +492,8 @@ CLinuxDMABufV1Protocol::CLinuxDMABufV1Protocol(const wl_interface* iface, const
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
- protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
|
|
||||||
+ protoLog(ERR, "DRM device {} has no render node, disabling linux dmabuf checks", device->nodes[DRM_NODE_PRIMARY] ? device->nodes[DRM_NODE_PRIMARY] : "null");
|
|
||||||
drmFreeDevice(&device);
|
|
||||||
- removeGlobal();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
5062
hosts/callisto/asahi-fix.patch
Normal file
5062
hosts/callisto/asahi-fix.patch
Normal file
File diff suppressed because it is too large
Load diff
|
@ -45,7 +45,7 @@
|
||||||
oldAttrs.patches
|
oldAttrs.patches
|
||||||
or []
|
or []
|
||||||
++ [
|
++ [
|
||||||
./0001-linux-dmabuf-allow-on-split-node-systems.patch
|
./asahi-fix.patch
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
|
|
39
hosts/callisto/hardware-configuration.nix.old
Executable file
39
hosts/callisto/hardware-configuration.nix.old
Executable file
|
@ -0,0 +1,39 @@
|
||||||
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
|
# and may be overwritten by future invocations. Please make changes
|
||||||
|
# to /etc/nixos/configuration.nix instead.
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = ["usb_storage" "sdhci_pci"];
|
||||||
|
boot.initrd.kernelModules = [];
|
||||||
|
boot.kernelModules = [];
|
||||||
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "/dev/disk/by-uuid/bc88058e-6e3a-4987-b78e-e19cb5611608";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/852F-07F1";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = ["fmask=0022" "dmask=0022"];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [];
|
||||||
|
|
||||||
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
|
||||||
|
}
|
Loading…
Reference in a new issue