diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-28 05:29:39 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-28 05:33:41 +0200 |
commit | e89e2edc7349c0df15fa03b8229c370340547538 (patch) | |
tree | 69805e409dd120efa67e2bf0fbd19d698835ac9a /pkgs/misc/cups | |
parent | 4f422e4efb539a88f978603d375a80f08b5270dc (diff) |
libusb-compat-0_1: rename from libusb
Diffstat (limited to 'pkgs/misc/cups')
-rw-r--r-- | pkgs/misc/cups/drivers/samsung/1.00.36/default.nix | 6 | ||||
-rw-r--r-- | pkgs/misc/cups/drivers/samsung/1.00.37.nix | 6 | ||||
-rw-r--r-- | pkgs/misc/cups/drivers/samsung/4.01.17.nix | 4 |
3 files changed, 8 insertions, 8 deletions
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 308be5337d09..4088ce700de2 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 b7e75c2a16a9..c205560706f6 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 755003e4d300..5de93b20cb80 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"; |