From 80ee38741ad67cfa7b2ce30bd7e844065bca0e35 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 25 Oct 2025 15:37:52 +0530 Subject: [PATCH] libdisplay-info_0_2: init at 0.2.0 for niri, cosmic-comp, pin libdisplay-info --- pkgs/by-name/co/cosmic-comp/package.nix | 4 ++-- pkgs/by-name/li/libdisplay-info/package.nix | 6 +++--- .../by-name/li/libdisplay-info_0_2/package.nix | 18 ++++++++++++++++++ pkgs/by-name/ni/niri/package.nix | 4 ++-- pkgs/by-name/we/weston/package.nix | 4 ++-- 5 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 pkgs/by-name/li/libdisplay-info_0_2/package.nix diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 1011e2cfc43c..8ab4bf69962e 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -5,7 +5,7 @@ fetchFromGitHub, libcosmicAppHook, pkg-config, - libdisplay-info, + libdisplay-info_0_2, libgbm, libinput, pixman, @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; buildInputs = [ - libdisplay-info + libdisplay-info_0_2 libgbm libinput pixman diff --git a/pkgs/by-name/li/libdisplay-info/package.nix b/pkgs/by-name/li/libdisplay-info/package.nix index efa503d495a2..020c587cb7c6 100644 --- a/pkgs/by-name/li/libdisplay-info/package.nix +++ b/pkgs/by-name/li/libdisplay-info/package.nix @@ -10,7 +10,7 @@ v4l-utils, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdisplay-info"; version = "0.3.0"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "emersion"; repo = "libdisplay-info"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-nXf2KGovNKvcchlHlzKBkAOeySMJXgxMpbi5z9gLrdc="; }; @@ -44,4 +44,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ pedrohlc ]; }; -} +}) diff --git a/pkgs/by-name/li/libdisplay-info_0_2/package.nix b/pkgs/by-name/li/libdisplay-info_0_2/package.nix new file mode 100644 index 000000000000..802dc582ebd2 --- /dev/null +++ b/pkgs/by-name/li/libdisplay-info_0_2/package.nix @@ -0,0 +1,18 @@ +{ + libdisplay-info, + fetchFromGitLab, +}: + +libdisplay-info.overrideAttrs ( + finalAttrs: oldAttrs: { + version = "0.2.0"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "emersion"; + repo = "libdisplay-info"; + rev = finalAttrs.version; + sha256 = "sha256-6xmWBrPHghjok43eIDGeshpUEQTuwWLXNHg7CnBUt3Q="; + }; + } +) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 52dee4964bcd..43f4d7c45ff1 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -4,7 +4,7 @@ eudev, fetchFromGitHub, installShellFiles, - libdisplay-info, + libdisplay-info_0_2, libglvnd, libinput, libxkbcommon, @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; buildInputs = [ - libdisplay-info + libdisplay-info_0_2 libglvnd # For libEGL libinput libxkbcommon diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix index 4a07300af6b4..3980a633deae 100644 --- a/pkgs/by-name/we/weston/package.nix +++ b/pkgs/by-name/we/weston/package.nix @@ -10,7 +10,7 @@ wayland-scanner, cairo, libGL, - libdisplay-info, + libdisplay-info_0_2, libdrm, libevdev, libinput, @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo libGL - libdisplay-info + libdisplay-info_0_2 libdrm libevdev libinput