about summary refs log tree commit diff
path: root/sys
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2024-03-22 16:39:26 +0100
committerAlyssa Ross <hi@alyssa.is>2024-03-22 16:39:26 +0100
commit9f0ef3c2fc9ac63e2077663e4dd2953db59347b4 (patch)
tree969e3c62d199cf11c78cf63a710cde371877d09c /sys
parentbf6d657e5dbcb5e39fda280ef7e86b2a7794ca86 (diff)
downloadnixlib-9f0ef3c2fc9ac63e2077663e4dd2953db59347b4.tar
nixlib-9f0ef3c2fc9ac63e2077663e4dd2953db59347b4.tar.gz
nixlib-9f0ef3c2fc9ac63e2077663e4dd2953db59347b4.tar.bz2
nixlib-9f0ef3c2fc9ac63e2077663e4dd2953db59347b4.tar.lz
nixlib-9f0ef3c2fc9ac63e2077663e4dd2953db59347b4.tar.xz
nixlib-9f0ef3c2fc9ac63e2077663e4dd2953db59347b4.tar.zst
nixlib-9f0ef3c2fc9ac63e2077663e4dd2953db59347b4.zip
sys/mbp.nix: remove libwebp hack revert
nixos-apple-silicon now has a special case for the coreutils test
suite, which conflicts with this patch.  I think that's worse than
just reverting it, but it's too hard to figure out how to get it not
to apply that patch.
Diffstat (limited to 'sys')
-rw-r--r--sys/mbp.nix10
1 files changed, 0 insertions, 10 deletions
diff --git a/sys/mbp.nix b/sys/mbp.nix
index 79117cb4e8de..94d80e5404aa 100644
--- a/sys/mbp.nix
+++ b/sys/mbp.nix
@@ -30,16 +30,6 @@
   hardware.asahi.withRust = true;
 
   boot.kernelPatches = [
-    # Causes gnulib tests to fail.
-    {
-      name = "revert-asahi-libwebp-hack.patch";
-      patch = pkgs.fetchpatch {
-        url = "https://github.com/AsahiLinux/linux/commit/081abc5fa701738699705a6c0a41c824df77cb37.patch";
-        revert = true;
-        hash = "sha256-ZUfjjmRGpT/N/fkjYUB12pFshICJadGytysSoBvXZq0=";
-      };
-    }
-
     {
       name = "drm-fix.patch";
       patch = pkgs.fetchpatch {