libusb-compat-0_1: rename from libusb

This commit is contained in:
Jan Tojnar
2020-04-28 05:33:41 +02:00
parent 4f422e4efb
commit e89e2edc73
61 changed files with 129 additions and 128 deletions
@@ -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/
'';
+3 -3
View File
@@ -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/
'';
+2 -2
View File
@@ -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";