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 = 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 eef9c18296a8..cc9e1a55b1ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31238,6 +31238,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 { });