remove mozc hacks

NixOS/nixpkgs#366868
scarlet-storm · Dec 23, 2024 · 8861b00 · 8861b00
1 parent 6e36d2b
commit 8861b00
Showing 1 changed file with 15 additions and 38 deletions.
diff --git a/overlays/default.nix b/overlays/default.nix
@@ -2,43 +2,20 @@
 
 {
   nixpkgs.overlays = [
-    (
-      final: prev:
-      {
-        virglrenderer = prev.virglrenderer.overrideAttrs (previousAttrs: {
-          mesonFlags = previousAttrs.mesonFlags ++ [
-            (lib.mesonBool "venus" true)
-            (lib.mesonBool "minigbm_allocation" true)
-          ];
-          buildInputs = previousAttrs.buildInputs ++ [
-            prev.vulkan-loader
-            prev.vulkan-headers
-          ];
-        });
-        libvirt = prev.libvirt.override {
-          enableXen = false;
-          enableZfs = false;
-        };
-        procps = prev.procps.overrideAttrs {
-          meta.priority = 9;
-        };
-      }
-      // lib.genAttrs [ "mozc" "fcitx5-mozc" ] (
-        drv:
-        prev.${drv}.overrideAttrs (
-          previousAttrs:
-          (lib.optionalAttrs
-            (
-              builtins.compareVersions previousAttrs.version "2.30.5544.102" <= 0
-              && lib.strings.hasPrefix "gcc" prev.stdenv.cc.name
-              && builtins.compareVersions prev.stdenv.cc.version "14.0" >= 0
-            )
-            {
-              env.NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized";
-            }
-          )
-        )
-      )
-    )
+    (final: prev: {
+      virglrenderer = prev.virglrenderer.overrideAttrs (previousAttrs: {
+        mesonFlags = previousAttrs.mesonFlags ++ [
+          (lib.mesonBool "venus" true)
+          (lib.mesonBool "minigbm_allocation" true)
+        ];
+        buildInputs = previousAttrs.buildInputs ++ [
+          prev.vulkan-loader
+          prev.vulkan-headers
+        ];
+      });
+      procps = prev.procps.overrideAttrs {
+        meta.priority = 9;
+      };
+    })
   ];
 }