Merge master into staging-next

3 files changed, 10 insertions, 15 deletions

diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix
index fda56c0d8cb7a..c82f4f4d5f80f 100644
--- a/pkgs/applications/graphics/epick/default.nix
+++ b/pkgs/applications/graphics/epick/default.nix
@@ -4,11 +4,7 @@
 , stdenv
 , python3
 , libGL
-, libX11
-, libXcursor
-, libXi
-, libXrandr
-, libxcb
+, xorg
 , libxkbcommon
 , AppKit
 , IOKit
@@ -31,11 +27,11 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.isLinux [
     libGL
-    libX11
-    libXcursor
-    libXi
-    libXrandr
-    libxcb
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libxcb
     libxkbcommon
   ] ++ lib.optionals stdenv.isDarwin [
     AppKit
diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix
index 06cab430bc3f1..32f6ac97fa370 100644
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "hydrus";
-  version = "501";
+  version = "502";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "hydrusnetwork";
     repo = "hydrus";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-dmQD3CAAAhE6IOfT38PHUIlHdDFdk6HZ6ZEZmKw7+WM=";
+    sha256 = "sha256-f3VnPmrRdo4PLQvS5pUafOh6ppq4hiwolz/FVVBNgxI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix
index 5615044b90e7b..1f25332e85269 100644
--- a/pkgs/applications/graphics/menyoki/default.nix
+++ b/pkgs/applications/graphics/menyoki/default.nix
@@ -6,8 +6,7 @@
 , stdenv
 , withSixel ? false
 , libsixel
-, libX11
-, libXrandr
+, xorg
 , AppKit
 , withSki ? true
 }:
@@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     ++ lib.optional stdenv.isLinux pkg-config;
 
   buildInputs = lib.optional withSixel libsixel
-    ++ lib.optionals stdenv.isLinux [ libX11 libXrandr ]
+    ++ lib.optionals stdenv.isLinux (with xorg; [ libX11 libXrandr ])
     ++ lib.optional stdenv.isDarwin AppKit;
 
   buildNoDefaultFeatures = !withSki;