From d9bc210285c1971afd9abe9fbe89a5a14c8df2a7 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Tue, 12 Dec 2023 23:34:21 +0200 Subject: [PATCH] Nix: remove libdrm override Nixpkgs update has the new version. --- flake.lock | 12 ++++++------ nix/default.nix | 12 +----------- nix/overlays.nix | 24 ------------------------ nix/wlroots.nix | 25 +++++++------------------ 4 files changed, 14 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index a7743fd0..8b7aa952 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -95,11 +95,11 @@ ] }, "locked": { - "lastModified": 1700508250, - "narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=", + "lastModified": 1702334919, + "narHash": "sha256-ibOZ3TLjqndGMcj2f+07NFwDWoum4IbzF58byZuJJNg=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47", + "rev": "f5c3576c3b6cb1c31a8dfa3e4113f59bfe40cd71", "type": "github" }, "original": { diff --git a/nix/default.nix b/nix/default.nix index 68b1bb22..d80a42a9 100644 --- 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 index 9ad623fe..60ebd574 100644 --- 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 index 0b9186e9..005762c3 100644 --- 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 + ]; })