From f0461bc93b9ee0ad44ba129e17f8f89bff82ef4e Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 29 Jul 2024 15:26:22 +0800 Subject: [PATCH 1/2] {scenefx,swayfx-unwrapped}: depend on wlroots_0_17 each new wlroots release comes with so many breaking changes, should keep depending on `wlroots_0_*` before wlroots 1.0 release --- pkgs/by-name/sc/scenefx/package.nix | 4 ++-- pkgs/by-name/sw/swayfx-unwrapped/package.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sc/scenefx/package.nix b/pkgs/by-name/sc/scenefx/package.nix index ee92339b9a1f..6514cec7fc1a 100644 --- a/pkgs/by-name/sc/scenefx/package.nix +++ b/pkgs/by-name/sc/scenefx/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, meson, ninja, - wlroots, + wlroots_0_17, scdoc, pkg-config, wayland, @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { pixman wayland wayland-protocols - wlroots + wlroots_0_17 ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix index b90220a7c1ff..1edc6d3d4cb9 100644 --- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix +++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix @@ -25,7 +25,7 @@ scenefx, wayland-scanner, xcbutilwm, - wlroots, + wlroots_0_17, testers, nixosTests, # Used by the NixOS module: @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { scenefx wayland wayland-protocols - (wlroots.override { inherit (finalAttrs) enableXWayland; }) + (wlroots_0_17.override { inherit (finalAttrs) enableXWayland; }) ] ++ lib.optionals finalAttrs.enableXWayland [ xcbutilwm ]; mesonFlags = From febcfca9ce1fcddf2675fcb76e623442b3ce7163 Mon Sep 17 00:00:00 2001 From: rewine Date: Mon, 29 Jul 2024 15:29:58 +0800 Subject: [PATCH 2/2] wlroots_0_18: init at 0.18.0 --- pkgs/development/libraries/wlroots/default.nix | 17 ++++++++++++++++- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 687a51832f96..81b7b9140ae7 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -23,6 +23,7 @@ , glslang , libliftoff , libdisplay-info +, lcms2 , nixosTests , enableXWayland ? true @@ -137,5 +138,19 @@ rec { ]; }; - wlroots = wlroots_0_17; + wlroots_0_18 = generic { + version = "0.18.0"; + hash = "sha256-LiRnvu7qCbfSg+ONWVCtWwdzxxFZHfbgmy7zApCIW40="; + extraNativeBuildInputs = [ + hwdata + ]; + extraBuildInputs = [ + ffmpeg + libliftoff + libdisplay-info + lcms2 + ]; + }; + + wlroots = wlroots_0_18; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83d119d7c6a3..2badc9999642 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31230,6 +31230,7 @@ with pkgs; inherit (callPackages ../development/libraries/wlroots {}) wlroots_0_16 wlroots_0_17 + wlroots_0_18 wlroots; sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });