From d0b9aa6fa28b55983e7cf2fa00f68b95d50f9ff8 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:38:18 +0200
Subject: [PATCH] usbredir: request libusb1 directly

Also, fix the website there, and tidy up the spice-gtk derivation, which
makes use of libusb1 too.
---
 .../libraries/spice-gtk/default.nix           | 50 ++++++++++---------
 .../libraries/usbredir/default.nix            |  7 ++-
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index f418ecda89e6..22370cee448e 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -1,35 +1,36 @@
 { stdenv
 , fetchurl
-, pkgconfig
+, acl
+, cyrus_sasl
+, docbook_xsl
+, epoxy
+, gettext
+, gobject-introspection
+, gst_all_1
+, gtk-doc
+, gtk3
+, json-glib
+, libcacard
+, libdrm
+, libjpeg_turbo
+, libopus
+, libsoup
+, libusb1
+, lz4
 , meson
 , ninja
+, openssl
+, perl
+, phodav
+, pixman
+, pkgconfig
+, polkit
 , python3
 , spice-protocol
-, gettext
-, openssl
-, pixman
-, gobject-introspection
-, libjpeg_turbo
-, zlib
-, cyrus_sasl
 , usbredir
-, libsoup
-, polkit
-, acl
 , usbutils
 , vala
-, gtk3
-, epoxy
-, libdrm
-, gst_all_1
-, phodav
-, libopus
-, gtk-doc
-, json-glib
-, lz4
-, libcacard
-, perl
-, docbook_xsl
+, zlib
 , withPolkit ? true
 }:
 
@@ -99,9 +100,10 @@ stdenv.mkDerivation rec {
     libcacard
     libdrm
     libjpeg_turbo
+    libopus
+    libusb1
     lz4
     openssl
-    libopus
     phodav
     pixman
     spice-protocol
diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix
index 79cac7384987..2ac7c823e22a 100644
--- a/pkgs/development/libraries/usbredir/default.nix
+++ b/pkgs/development/libraries/usbredir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libusb }:
+{ stdenv, fetchurl, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
   pname = "usbredir";
@@ -12,14 +12,13 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libusb ];
-  propagatedBuildInputs = [ libusb ];
+  propagatedBuildInputs = [ libusb1 ];
 
   outputs = [ "out" "dev" ];
 
   meta = with stdenv.lib; {
     description = "USB traffic redirection protocol";
-    homepage = "http://spice-space.org/page/UsbRedir";
+    homepage = "https://www.spice-space.org/usbredir.html";
     license = licenses.lgpl21;
 
     maintainers = [ maintainers.offline ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 668ef2561df6..1fe75fa63915 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14793,9 +14793,7 @@ in
 
   ustr = callPackage ../development/libraries/ustr { };
 
-  usbredir = callPackage ../development/libraries/usbredir {
-    libusb = libusb1;
-  };
+  usbredir = callPackage ../development/libraries/usbredir { };
 
   uthash = callPackage ../development/libraries/uthash { };