Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/libraries/mesa/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix

Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391

2 files changed, 12 insertions, 19 deletions

diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix
index 8e0ebab220af..726640293e34 100644
--- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix
@@ -28,15 +28,17 @@
 
 let
   generic = { version, hash, extraBuildInputs ? [ ], extraNativeBuildInputs ? [ ], extraPatch ? "" }:
-    stdenv.mkDerivation rec {
+    stdenv.mkDerivation (finalAttrs: {
       pname = "wlroots";
       inherit version;
 
+      inherit enableXWayland;
+
       src = fetchFromGitLab {
         domain = "gitlab.freedesktop.org";
         owner = "wlroots";
         repo = "wlroots";
-        rev = version;
+        rev = finalAttrs.version;
         inherit hash;
       };
 
@@ -48,7 +50,7 @@ let
       strictDeps = true;
       depsBuildBuild = [ pkg-config ];
 
-      nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]
+      nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ]
         ++ extraNativeBuildInputs;
 
       buildInputs = [
@@ -70,11 +72,11 @@ let
         xorg.xcbutilrenderutil
         xorg.xcbutilwm
       ]
-      ++ lib.optional enableXWayland xwayland
+      ++ lib.optional finalAttrs.enableXWayland xwayland
       ++ extraBuildInputs;
 
       mesonFlags =
-        lib.optional (!enableXWayland) "-Dxwayland=disabled"
+        lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled"
       ;
 
       postFixup = ''
@@ -98,33 +100,24 @@ let
           Pluggable, composable, unopinionated modules for building a Wayland
           compositor; or about 50,000 lines of code you were going to write anyway.
         '';
-        inherit (src.meta) homepage;
+        inherit (finalAttrs.src.meta) homepage;
         changelog = "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}";
         license = licenses.mit;
         platforms = platforms.linux;
         maintainers = with maintainers; [ primeos synthetica ];
       };
-    };
+    });
 
 in
 rec {
-  wlroots_0_14 = generic {
-    version = "0.14.1";
-    hash = "sha256-wauk7TCL/V7fxjOZY77KiPbfydIc9gmOiYFOuum4UOs=";
-  };
-
   wlroots_0_15 = generic {
     version = "0.15.1";
     hash = "sha256-MFR38UuB/wW7J9ODDUOfgTzKLse0SSMIRYTpEaEdRwM=";
-    extraBuildInputs = [ vulkan-loader ];
-    extraNativeBuildInputs = [ glslang ];
   };
 
   wlroots_0_16 = generic {
     version = "0.16.2";
     hash = "sha256-JeDDYinio14BOl6CbzAPnJDOnrk4vgGNMN++rcy2ItQ=";
-    extraBuildInputs = [ vulkan-loader ];
-    extraNativeBuildInputs = [ glslang ];
     extraPatch = ''
       substituteInPlace backend/drm/meson.build \
         --replace /usr/share/hwdata/ ${hwdata}/share/hwdata/
diff --git a/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix b/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix
index d2ff39d7d574..87234d208da3 100644
--- a/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix
+++ b/nixpkgs/pkgs/development/libraries/wlroots/protocols.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "wlr-protocols";
-  version = "unstable-2021-11-01";
+  version = "unstable-2022-09-05";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "wlroots";
     repo = "wlr-protocols";
-    rev = "d998ee6fc64ea7e066014023653d1271b7702c09";
-    sha256 = "1vw8b10d1pwsj6f4sr3imvwsy55d3435sp068sj4hdszkxc6axsr";
+    rev = "4264185db3b7e961e7f157e1cc4fd0ab75137568";
+    sha256 = "Ztc07RLg+BZPondP/r6Jo3Fw1QY/z1QsFvdEuOqQshA=";
   };
 
   strictDeps = true;