From e89e2edc7349c0df15fa03b8229c370340547538 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 28 Apr 2020 05:29:39 +0200
Subject: libusb-compat-0_1: rename from libusb

---
 pkgs/misc/cups/drivers/samsung/1.00.36/default.nix | 6 +++---
 pkgs/misc/cups/drivers/samsung/1.00.37.nix         | 6 +++---
 pkgs/misc/cups/drivers/samsung/4.01.17.nix         | 4 ++--
 pkgs/misc/drivers/epkowa/default.nix               | 4 ++--
 pkgs/misc/drivers/gutenprint/default.nix           | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'pkgs/misc')

diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
index 308be5337d0..4088ce700de 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cups, libusb, libxml2, perl }:
+{ stdenv, fetchurl, cups, libusb-compat-0_1, libxml2, perl }:
 
 let
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     cups
-    libusb
+    libusb-compat-0_1
     libxml2
     perl
   ];
@@ -91,7 +91,7 @@ in stdenv.mkDerivation rec {
     done
 
     patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so"
-    patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1"
+    patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1"
 
     ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
   '';
diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix
index b7e75c2a16a..c205560706f 100644
--- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix
+++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cups, libusb, libxml2 }:
+{ stdenv, fetchurl, cups, libusb-compat-0_1, libxml2 }:
 
 let
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     cups
-    libusb
+    libusb-compat-0_1
     libxml2
   ];
 
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
     done
 
     patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so"
-    patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1"
+    patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1"
 
     ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
   '';
diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix
index 755003e4d30..5de93b20cb8 100644
--- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix
+++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix
@@ -11,14 +11,14 @@
 # }
 # (This advice was tested on the 1st November 2016.)
 
-{ stdenv, fetchurl, cups, libusb }:
+{ stdenv, fetchurl, cups, libusb-compat-0_1 }:
 
 # Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html>
 # to see what will break when upgrading. Consider a new versioned attribute.
 let
   installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386";
   appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else "";
-  libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}";
+  libPath = stdenv.lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}";
 in stdenv.mkDerivation rec {
   pname = "samsung-UnifiedLinuxDriver";
   version = "4.01.17";
diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix
index ecf79a953fe..9724e68a04d 100644
--- a/pkgs/misc/drivers/epkowa/default.nix
+++ b/pkgs/misc/drivers/epkowa/default.nix
@@ -3,7 +3,7 @@ pkgconfig, libtool,
 gtk2,
 libxml2,
 libxslt,
-libusb,
+libusb-compat-0_1,
 sane-backends,
 rpm, cpio,
 getopt,
@@ -263,7 +263,7 @@ stdenv.mkDerivation rec {
     gtk2
     libxml2
     libtool
-    libusb
+    libusb-compat-0_1
     sane-backends
     makeWrapper
   ];
diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index 96c0968882d..9946f499329 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -2,7 +2,7 @@
 { stdenv, lib, fetchurl, makeWrapper, pkgconfig
 , ijs, zlib
 , gimp2Support ? false, gimp
-, cupsSupport ? true, cups, libusb, perl
+, cupsSupport ? true, cups, libusb-compat-0_1, perl
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ ijs zlib ]
     ++ lib.optionals gimp2Support [ gimp.gtk gimp ]
-    ++ lib.optionals cupsSupport [ cups libusb perl ];
+    ++ lib.optionals cupsSupport [ cups libusb-compat-0_1 perl ];
 
   configureFlags = lib.optionals cupsSupport [
     "--disable-static-genppd" # should be harmless on NixOS
-- 
cgit 1.4.1