From eac6c63db1a1783ef8cfd4921229185e34f51032 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:37:45 +0200
Subject: [PATCH 1/9] hidapi: request libusb1 directly

---
 pkgs/development/libraries/hidapi/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix               | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix
index 28e96244ba5..11cdd0ab7e0 100644
--- a/pkgs/development/libraries/hidapi/default.nix
+++ b/pkgs/development/libraries/hidapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb1
 , darwin }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   buildInputs = [ ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libusb systemd ];
+    ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 systemd ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3316b446b9a..668ef2561df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12141,9 +12141,7 @@ in
 
   heyefi = haskellPackages.heyefi;
 
-  hidapi = callPackage ../development/libraries/hidapi {
-    libusb = libusb1;
-  };
+  hidapi = callPackage ../development/libraries/hidapi { };
 
   highfive = callPackage ../development/libraries/highfive { };
 

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 2/9] 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 f418ecda89e..22370cee448 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 79cac738498..2ac7c823e22 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 668ef2561df..1fe75fa6391 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 { };
 

From 88048e3213e45b586abb9deae4c696cf6b8f1d42 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:39:32 +0200
Subject: [PATCH 3/9] brickd: request libusb1 directly

---
 pkgs/servers/brickd/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix
index b6c5b2a60af..4b18e73284f 100644
--- a/pkgs/servers/brickd/default.nix
+++ b/pkgs/servers/brickd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libusb, pkgconfig, pmutils, udev} :
+{ stdenv, fetchgit, libusb1, pkgconfig, pmutils, udev} :
 
 let
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libusb pmutils udev ];
+  buildInputs = [ libusb1 pmutils udev ];
 
   # shell thing didn't work so i replaced it using nix
   prePatch = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fe75fa6391..0dc77f5165f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5874,9 +5874,7 @@ in
 
   briss = callPackage ../tools/graphics/briss { };
 
-  brickd = callPackage ../servers/brickd {
-    libusb = libusb1;
-  };
+  brickd = callPackage ../servers/brickd { };
 
   bully = callPackage ../tools/networking/bully {
     openssl = openssl_1_0_2;

From f3a5fd548a76282b0fd808e118b09baa680105e3 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:42:01 +0200
Subject: [PATCH 4/9] yubikey-personalization: request libusb1 directly

---
 pkgs/tools/misc/yubikey-personalization/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                     | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index 41cb53d9d3b..5ef828762f6 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libusb, libyubikey, json_c }:
+{ stdenv, fetchurl, pkgconfig, libusb1, libyubikey, json_c }:
 
 stdenv.mkDerivation rec {
   pname = "yubikey-personalization";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libusb libyubikey json_c ];
+  buildInputs = [ libusb1 libyubikey json_c ];
 
   configureFlags = [
     "--with-backend=libusb-1.0"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0dc77f5165f..c14ba92ce5e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15062,9 +15062,7 @@ in
 
   yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { };
 
-  yubikey-personalization = callPackage ../tools/misc/yubikey-personalization {
-    libusb = libusb1;
-  };
+  yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { };
 
   yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { };
 

From 2c621ff4f4ad4eb2467fc9f98bab327a25f2e3ac Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:43:07 +0200
Subject: [PATCH 5/9] cups: request libusb1 directly

---
 pkgs/misc/cups/default.nix      | 6 +++---
 pkgs/top-level/all-packages.nix | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index f229ced8936..b16c0645cda 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -13,7 +13,7 @@
 , acl
 , gmp
 , darwin
-, libusb ? null
+, libusb1 ? null
 , gnutls ? null
 , avahi ? null
 , libpaper ? null
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig removeReferencesTo ];
 
-  buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ]
+  buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ]
     ++ optionals stdenv.isLinux [ avahi pam dbus ]
     ++ optional enableSystemd systemd
     # Separate from above only to not modify order, to avoid mass rebuilds; merge this with the above at next big change.
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     "--enable-dbus"
     "--enable-pam"
     "--with-dbusdir=${placeholder "out"}/share/dbus-1"
-  ] ++ optional (libusb != null) "--enable-libusb"
+  ] ++ optional (libusb1 != null) "--enable-libusb"
     ++ optional (gnutls != null) "--enable-ssl"
     ++ optional (avahi != null) "--enable-avahi"
     ++ optional (libpaper != null) "--enable-libpaper"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c14ba92ce5e..d2b58e1323d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25191,9 +25191,7 @@ in
 
   clinfo = callPackage ../tools/system/clinfo { };
 
-  cups = callPackage ../misc/cups {
-    libusb = libusb1;
-  };
+  cups = callPackage ../misc/cups { };
 
   cups-filters = callPackage ../misc/cups/filters.nix { };
 

From f5368e0194ad794a98bd1cbd90a5b09ff3f3b2e3 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:50:38 +0200
Subject: [PATCH 6/9] cnijfilter_4_00: request libusb1 directly

---
 .../cups/drivers/cnijfilter_4_00/default.nix  | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
index 679d8906994..9b328c20b71 100644
--- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchzip,
   autoconf, automake, libtool,
   cups, popt, libtiff, libpng,
-  ghostscript, glib, libusb, libxml2 }:
+  ghostscript, glib, libusb1, libxml2 }:
 
 /* this derivation is basically just a transcription of the rpm .spec
    file included in the tarball */
 
-let arch = 
+let arch =
   if stdenv.hostPlatform.system == "x86_64-linux" then "64"
     else if stdenv.hostPlatform.system == "i686-linux" then "32"
     else throw "Unsupported system ${stdenv.hostPlatform.system}";
@@ -32,7 +32,7 @@ in stdenv.mkDerivation {
 
   buildInputs = [ autoconf libtool automake
                   cups popt libtiff libpng
-                  ghostscript glib libusb libxml2 ];
+                  ghostscript glib libusb1 libxml2 ];
 
   # patches from https://github.com/tokiclover/bar-overlay/tree/master/net-print/cnijfilter
   patches = [
@@ -53,10 +53,10 @@ in stdenv.mkDerivation {
 
   configurePhase = ''
     cd libs
-    ./autogen.sh --prefix=$out 
+    ./autogen.sh --prefix=$out
 
     cd ../bscc2sts
-    ./autogen.sh 
+    ./autogen.sh
 
     cd ../cnijnpr
     ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib
@@ -68,25 +68,25 @@ in stdenv.mkDerivation {
     ./autogen.sh --prefix=$out --enable-progpath=$out/bin
 
     cd ../pstocanonij
-    ./autogen.sh --prefix=$out --enable-progpath=$out/bin 
+    ./autogen.sh --prefix=$out --enable-progpath=$out/bin
 
     cd ../backend
     ./autogen.sh --prefix=$out
 
     cd ../backendnet
-    ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin 
+    ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin
 
     cd ../cmdtocanonij
     ./autogen.sh --prefix=$out --datadir=$out/share
 
     cd ../cnijbe
-    ./autogen.sh --prefix=$out --enable-progpath=$out/bin 
+    ./autogen.sh --prefix=$out --enable-progpath=$out/bin
 
     cd ../lgmon2
     substituteInPlace src/Makefile.am \
         --replace /usr/include/libusb-1.0 \
-                  ${libusb.dev}/include/libusb-1.0
-    ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin 
+                  ${libusb1.dev}/include/libusb-1.0
+    ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin
 
     cd ..;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2b58e1323d..6ead4f47408 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25239,9 +25239,7 @@ in
   # this driver ships with pre-compiled 32-bit binary libraries
   cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { };
 
-  cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 {
-    libusb = libusb1;
-  };
+  cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { };
 
   cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 {
     libusb = libusb1;

From d0e4ecb182bb2edc890c238abc6055701bcadddb Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:53:01 +0200
Subject: [PATCH 7/9] cnijfilter2: request libusb1 directly

---
 pkgs/misc/cups/drivers/cnijfilter2/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index 323163bed33..b04ef89d215 100644
--- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool
+{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb1, libtool
 , withDebug ? false }:
 
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    cups automake autoconf glib libxml2 libusb libtool
+    cups automake autoconf glib libxml2 libusb1 libtool
   ];
 
   # lgmon3's --enable-libdir flag is used soley for specifying in which
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
       cd lgmon3
       substituteInPlace src/Makefile.am \
         --replace /usr/include/libusb-1.0 \
-                  ${libusb.dev}/include/libusb-1.0
+                  ${libusb1.dev}/include/libusb-1.0
       ./autogen.sh --prefix=$out --enable-progpath=$out/bin \
                    --datadir=$out/share \
                    --enable-libdir=/var/cache/cups
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ead4f47408..7050a0b9ba3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25241,9 +25241,7 @@ in
 
   cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { };
 
-  cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 {
-    libusb = libusb1;
-  };
+  cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { };
 
   darcnes = callPackage ../misc/emulators/darcnes { };
 

From dd03e76f61889409273b1f5527c52092783f6bf4 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:55:18 +0200
Subject: [PATCH 8/9] stlink: inline libusb-static

This is a stlink-specific detail, and doesn't need to be in
top-level.nix
---
 pkgs/development/tools/misc/stlink/default.nix | 10 +++++++---
 pkgs/top-level/all-packages.nix                |  5 +----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index c59847b1e0f..0aa8d07f765 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -1,9 +1,13 @@
 { stdenv, fetchFromGitHub, cmake, libusb1 }:
 
-# IMPORTANT: You need permissions to access the stlink usb devices. 
+let
+  # The Darwin build of stlink explicitly refers to static libusb.
+  libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1;
+
+# IMPORTANT: You need permissions to access the stlink usb devices.
 # Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix
 
-stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
   pname = "stlink";
   version = "1.6.0";
 
@@ -14,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x";
   };
 
-  buildInputs = [ cmake libusb1 ];
+  buildInputs = [ cmake libusb1' ];
   patchPhase = ''
     sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt
     sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7050a0b9ba3..d735aa94b7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14614,10 +14614,7 @@ in
 
   stfl = callPackage ../development/libraries/stfl { };
 
-  stlink = callPackage ../development/tools/misc/stlink {
-    # The Darwin build of stlink explicitly refers to static libusb.
-    libusb1 = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1;
-  };
+  stlink = callPackage ../development/tools/misc/stlink { };
 
   steghide = callPackage ../tools/security/steghide {};
 

From 4f27b45bb5884c4943ad1f9d9e62b2e64d2bb74d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 24 Apr 2020 23:56:39 +0200
Subject: [PATCH 9/9] stlink: cmake is a nativeBuildInput

---
 pkgs/development/tools/misc/stlink/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index 0aa8d07f765..7793d9185e7 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -18,7 +18,8 @@ in stdenv.mkDerivation rec {
     sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x";
   };
 
-  buildInputs = [ cmake libusb1' ];
+  buildInputs = [ libusb1' ];
+  nativeBuildInputs = [ cmake ];
   patchPhase = ''
     sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt
     sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt