diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/wlroots')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/wlroots/default.nix | 20 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/wlroots/protocols.nix | 3 |
2 files changed, 10 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 8b4abf7d5d12..e9265de54c61 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -17,6 +17,7 @@ , xorg , libpng , ffmpeg_4 +, ffmpeg , hwdata , seatd , vulkan-loader @@ -57,7 +58,6 @@ let ++ extraNativeBuildInputs; buildInputs = [ - ffmpeg_4 libGL libcap libinput @@ -116,6 +116,9 @@ rec { wlroots_0_15 = generic { version = "0.15.1"; hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM="; + extraBuildInputs = [ + ffmpeg_4 + ]; }; wlroots_0_16 = generic { @@ -125,23 +128,20 @@ rec { substituteInPlace backend/drm/meson.build \ --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/ ''; + extraBuildInputs = [ + ffmpeg_4 + ]; }; wlroots_0_17 = generic { - version = "0.17.0"; - hash = "sha256-VUrnSG4UAAH0cBy15lG0w8RernwegD6lkOdLvWU3a4c="; + version = "0.17.1"; + hash = "sha256-Z0gWM7AQqJOSr2maUtjdgk/MF6pyeyFMMTaivgt+RMI="; extraBuildInputs = [ + ffmpeg hwdata libliftoff libdisplay-info ]; - patches = [ - (fetchpatch { - name = "tinywl-fix-wlroots-dependency-constraint-in-Makefile.patch"; - url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/fe53ec693789afb44c899cad8c2df70c8f9f9023.patch"; - hash = "sha256-wU62hXgmsAyT5j/bWeCFBkvM9cYjUntdCycQt5HAhb8="; - }) - ]; }; wlroots = wlroots_0_17; diff --git a/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix b/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix index 87234d208da3..0a747c1e86a4 100644 --- a/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix +++ b/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix @@ -19,9 +19,6 @@ stdenv.mkDerivation rec { substituteInPlace wlr-protocols.pc.in \ --replace '=''${pc_sysrootdir}' "=" \ --replace '=@prefix@' "=$out" - - substituteInPlace Makefile \ - --replace 'wlr-output-power-management-v1.xml' 'wlr-output-power-management-unstable-v1.xml' ''; doCheck = true; |