Nix: remove libdrm override

Nixpkgs update has the new version.
hyprwm · Dec 12, 2023 · d9bc210 · d9bc210
1 parent 4de9860
commit d9bc210
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 59 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nix/default.nix b/nix/default.nix
@@ -40,16 +40,6 @@
   nvidiaPatches ? false,
   hidpiXWayland ? false,
 }:
-let
-  # NOTE: remove after https://github.com/NixOS/nixpkgs/pull/271096 reaches nixos-unstable
-  libdrm_2_4_118 = libdrm.overrideAttrs(attrs: rec {
-    version = "2.4.118";
-    src = fetchurl {
-      url = "https://dri.freedesktop.org/${attrs.pname}/${attrs.pname}-${version}.tar.xz";
-      hash = "sha256-p3e9hfK1/JxX+IbIIFgwBXgxfK/bx30Kdp1+mpVnq4g=";
-    };
-  });
-in
 assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed.";
 assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed.";
 assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland";
@@ -85,7 +75,7 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
         cairo
         git
         hyprland-protocols
-        libdrm_2_4_118
+        libdrm
         libGL
         libinput
         libxkbcommon

diff --git a/nix/overlays.nix b/nix/overlays.nix
@@ -70,30 +70,6 @@ in {
     wlroots-hyprland = final.callPackage ./wlroots.nix {
       version = "${mkDate (inputs.wlroots.lastModifiedDate or "19700101")}_${inputs.wlroots.shortRev or "dirty"}";
       src = inputs.wlroots;
-
-      libdisplay-info = prev.libdisplay-info.overrideAttrs (old: {
-        version = "0.1.1+date=2023-03-02";
-        src = final.fetchFromGitLab {
-          domain = "gitlab.freedesktop.org";
-          owner = "emersion";
-          repo = old.pname;
-          rev = "147d6611a64a6ab04611b923e30efacaca6fc678";
-          sha256 = "sha256-/q79o13Zvu7x02SBGu0W5yQznQ+p7ltZ9L6cMW5t/o4=";
-        };
-      });
-
-      libliftoff = prev.libliftoff.overrideAttrs (old: {
-        version = "0.5.0-dev";
-        src = final.fetchFromGitLab {
-          domain = "gitlab.freedesktop.org";
-          owner = "emersion";
-          repo = old.pname;
-          rev = "d98ae243280074b0ba44bff92215ae8d785658c0";
-          sha256 = "sha256-DjwlS8rXE7srs7A8+tHqXyUsFGtucYSeq6X0T/pVOc8=";
-        };
-
-        NIX_CFLAGS_COMPILE = toString ["-Wno-error=sign-conversion"];
-      });
     };
   };
 }
diff --git a/nix/wlroots.nix b/nix/wlroots.nix
@@ -1,33 +1,22 @@
 {
-  fetchurl,
   version,
   src,
   wlroots,
   hwdata,
   libdisplay-info,
   libliftoff,
-  libdrm,
   enableXWayland ? true,
 }:
-let
-  # NOTE: remove after https://github.com/NixOS/nixpkgs/pull/271096 reaches nixos-unstable
-  libdrm_2_4_118 = libdrm.overrideAttrs(old: rec {
-    version = "2.4.118";
-    src = fetchurl {
-      url = "https://dri.freedesktop.org/${old.pname}/${old.pname}-${version}.tar.xz";
-      hash = "sha256-p3e9hfK1/JxX+IbIIFgwBXgxfK/bx30Kdp1+mpVnq4g=";
-    };
-  });
-in
 wlroots.overrideAttrs (old: {
   inherit version src enableXWayland;
 
   pname = "${old.pname}-hyprland";
 
-  # HACK: libdrm_2_4_118 is placed at the head of list to take precedence over libdrm in `old.buildInputs`
-  buildInputs = [libdrm_2_4_118] ++ old.buildInputs ++ [hwdata libliftoff libdisplay-info];
-
-  NIX_CFLAGS_COMPILE = toString [
-    "-Wno-error=maybe-uninitialized"
-  ];
+  buildInputs =
+    old.buildInputs
+    ++ [
+      hwdata
+      libliftoff
+      libdisplay-info
+    ];
 })