JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libusb-compat-0_1: rename from libusb

Browse Source
This commit is contained in:
Jan Tojnar 2020-04-28 05:29:39 +02:00
parent 4f422e4efb
commit e89e2edc73
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
61 changed files with 129 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/blockchains/monero-gui/default.nix
View File

@ -5,7 +5,7 @@
, qtquickcontrols, qtquickcontrols2
, monero, unbound, readline, boost, libunwind
, libsodium, pcsclite, zeromq, cppzmq
, hidapi, libusb, protobuf, randomx
, hidapi, libusb-compat-0_1, protobuf, randomx
}:
with stdenv.lib;
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
qtxmlpatterns
monero unbound readline
boost libunwind libsodium pcsclite zeromq
cppzmq hidapi libusb protobuf randomx
cppzmq hidapi libusb-compat-0_1 protobuf randomx
];
NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ];

4
pkgs/applications/blockchains/monero/default.nix
View File

@ -2,7 +2,7 @@
, cmake, pkgconfig
, boost, miniupnpc, openssl, unbound, cppzmq
, zeromq, pcsclite, readline, libsodium, hidapi
, pythonProtobuf, randomx, rapidjson, libusb
, pythonProtobuf, randomx, rapidjson, libusb-compat-0_1
, CoreData, IOKit, PCSC
}:
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline
libsodium hidapi randomx rapidjson
pythonProtobuf libusb
pythonProtobuf libusb-compat-0_1
] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
cmakeFlags = [

6
pkgs/applications/graphics/sane/backends/brscan4/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb }:
{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }:
let
myPatchElf = file: with stdenv.lib; ''
@ -30,13 +30,13 @@ in stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ];
buildInputs = [ libusb ];
buildInputs = [ libusb-compat-0_1 ];
dontBuild = true;
patchPhase = ''
${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"}
RPATH=${libusb.out}/lib
RPATH=${libusb-compat-0_1.out}/lib
for a in usr/lib64/sane/*.so*; do
if ! test -L $a; then
patchelf --set-rpath $RPATH $a

4
pkgs/applications/graphics/sane/frontends.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }:
{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb-compat-0_1 ? null }:
stdenv.mkDerivation rec {
pname = "sane-frontends";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ sane-backends libX11 gtk2 ]
++ stdenv.lib.optional (libusb != null) libusb;
++ stdenv.lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1;
nativeBuildInputs = [ pkgconfig ];
enableParallelBuilding = true;

4
pkgs/applications/graphics/sane/xsane.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng
, libusb ? null
, libusb-compat-0_1 ? null
, gimpSupport ? false, gimp ? null
}:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ]
++ (if libusb != null then [libusb] else [])
++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else [])
++ stdenv.lib.optional gimpSupport gimp;
meta = {

4
pkgs/applications/misc/digitalbitbox/default.nix
View File

@ -7,7 +7,7 @@
, libtool
, qrencode
, udev
, libusb
, libusb-compat-0_1
, makeWrapper
, pkgconfig
, qtbase
@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
libevent
libtool
udev
libusb
libusb-compat-0_1
qrencode
qtbase

4
pkgs/applications/misc/garmin-plugin/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, garmintools, libgcrypt, libusb, pkgconfig, tinyxml, zlib }:
{ stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }:
stdenv.mkDerivation {
name = "garmin-plugin-0.3.26";
src = fetchurl {
@ -7,7 +7,7 @@ stdenv.mkDerivation {
};
sourceRoot = "GarminPlugin-0.3.26/src";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ garmintools libusb libgcrypt tinyxml zlib ];
buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ];
configureFlags = [
"--with-libgcrypt-prefix=${libgcrypt.dev}"
"--with-garmintools-incdir=${garmintools}/include"

10
pkgs/applications/misc/golden-cheetah/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, mkDerivation
, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
, qtconnectivity, qtcharts, libusb
, qtconnectivity, qtcharts, libusb-compat-0_1
, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
}:
@ -27,7 +27,7 @@ in mkDerivation rec {
buildInputs = [
qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib
qtconnectivity qtcharts libusb
qtconnectivity qtcharts libusb-compat-0_1
];
nativeBuildInputs = [ flex makeWrapper qmake yacc ];
@ -39,9 +39,9 @@ in mkDerivation rec {
cp src/gcconfig.pri.in src/gcconfig.pri
cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri
echo 'LIBUSB_INSTALL = ${libusb}' >> src/gcconfig.pri
echo 'LIBUSB_INCLUDE = ${libusb.dev}/include' >> src/gcconfig.pri
echo 'LIBUSB_LIBS = -L${libusb}/lib -lusb' >> src/gcconfig.pri
echo 'LIBUSB_INSTALL = ${libusb-compat-0_1}' >> src/gcconfig.pri
echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri
echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri
sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local
# Use qtwebengine instead of qtwebkit

2
pkgs/applications/misc/lutris/chrootenv.nix
View File

@ -92,7 +92,7 @@ in buildFHSUserEnv {
multiPkgs = pkgs: with pkgs; [
# Common
libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio
libao libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l
libao libevdev udev libgcrypt libxml2 libusb-compat-0_1 libpng libmpeg2 libv4l
libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio
libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib
alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils

6
pkgs/applications/misc/nut/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi
{ stdenv, fetchurl, pkgconfig, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi
, libtool, makeWrapper, autoreconfHook, fetchpatch
}:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
})
];
buildInputs = [ neon libusb openssl udev avahi freeipmi ];
buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi ];
nativeBuildInputs = [ autoreconfHook libtool pkgconfig makeWrapper ];
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \
"$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib"
"$out/lib:${neon}/lib:${libusb-compat-0_1.out}/lib:${avahi}/lib:${freeipmi}/lib"
'';
meta = with stdenv.lib; {

4
pkgs/applications/misc/qlandkartegt/garmindev.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, libusb }:
{ stdenv, fetchurl, cmake, libusb-compat-0_1 }:
stdenv.mkDerivation rec {
pname = "garmindev";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
buildInputs = [ libusb ];
buildInputs = [ libusb-compat-0_1 ];
enableParallelBuilding = true;

4
pkgs/applications/misc/qlcplus/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev
, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb
, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1
, libsndfile, libmad
}:
@ -16,7 +16,7 @@ mkDerivation rec {
nativeBuildInputs = [ qmake pkgconfig ];
buildInputs = [
udev qtmultimedia qtscript alsaLib ola libftdi1 libusb libsndfile libmad
udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad
];
qmakeFlags = [ "INSTALLROOT=$(out)" ];

4
pkgs/applications/misc/subsurface/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkgconfig, qmake
, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib
, curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib
, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite
}:
@ -83,7 +83,7 @@ in stdenv.mkDerivation {
buildInputs = [
libdc googlemaps
curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip
curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip
qtbase qtconnectivity qtsvg qttools qtwebkit
];

4
pkgs/applications/radio/sdrangel/default.nix
View File

@ -13,7 +13,7 @@ libav,
libiio,
libopus,
libpulseaudio,
libusb,
libusb-compat-0_1,
limesuite,
mkDerivation,
ocl-icd,
@ -51,7 +51,7 @@ in mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
glew opencv3 libusb boost libopus limesuite libav libiio libpulseaudio
glew opencv3 libusb-compat-0_1 boost libopus limesuite libav libiio libpulseaudio
qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf
fftwFloat codec2' cm256cc serialdv
];

4
pkgs/applications/radio/soapysdr/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, lndir, makeWrapper
, fetchFromGitHub, cmake
, libusb, pkgconfig
, libusb-compat-0_1, pkgconfig
, usePython ? false
, python, ncurses, swig2
, extraPackages ? []
@ -25,7 +25,7 @@ in stdenv.mkDerivation {
};
nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
buildInputs = [ libusb ncurses ]
buildInputs = [ libusb-compat-0_1 ncurses ]
++ lib.optionals usePython [ python swig2 ];
propagatedBuildInputs = lib.optional usePython python.pkgs.numpy;

4
pkgs/applications/radio/welle-io/default.nix
View File

@ -1,6 +1,6 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
, qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2
, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec, lame, mpg123 }:
, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }:
let
version = "2.1";
@ -23,7 +23,7 @@ in mkDerivation {
faad2
fftwSinglePrec
lame
libusb
libusb-compat-0_1
mpg123
qtbase
qtcharts

4
pkgs/applications/science/math/cemu/default.nix
View File

@ -4,7 +4,7 @@
, SDL2
, libGL
, libarchive
, libusb
, libusb-compat-0_1
, qtbase
, qmake
, git
@ -33,7 +33,7 @@ mkDerivation rec {
SDL2
libGL
libarchive
libusb
libusb-compat-0_1
qtbase
libpng_apng
];

4
pkgs/applications/science/robotics/gazebo/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, cmake, pkgconfig, boost, protobuf, freeimage
, boost-build, boost_process
, xorg_sys_opengl, tbb, ogre, tinyxml-2
, libtar, glxinfo, libusb, libxslt, ignition
, libtar, glxinfo, libusb-compat-0_1, libxslt, ignition
, pythonPackages, utillinux
# these deps are hidden; cmake doesn't catch them
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
tinyxml-2
libtar
glxinfo
libusb
libusb-compat-0_1
libxslt
ignition.math2
sdformat

6
pkgs/applications/video/kodi/default.nix
View File

@ -25,7 +25,7 @@
, rtmpSupport ? true, rtmpdump ? null
, sambaSupport ? true, samba ? null
, udevSupport ? true, udev ? null
, usbSupport ? false, libusb ? null
, usbSupport ? false, libusb-compat-0_1 ? null
, vdpauSupport ? true, libvdpau ? null
, useWayland ? false, wayland ? null, wayland-protocols ? null
, waylandpp ? null, libxkbcommon ? null
@ -39,7 +39,7 @@ assert pulseSupport -> libpulseaudio != null;
assert rtmpSupport -> rtmpdump != null;
assert sambaSupport -> samba != null;
assert udevSupport -> udev != null;
assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable
assert usbSupport -> libusb-compat-0_1 != null && ! udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable
assert vdpauSupport -> libvdpau != null;
assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null;
@ -189,7 +189,7 @@ in stdenv.mkDerivation {
++ lib.optional rtmpSupport rtmpdump
++ lib.optional sambaSupport samba
++ lib.optional udevSupport udev
++ lib.optional usbSupport libusb
++ lib.optional usbSupport libusb-compat-0_1
++ lib.optional vdpauSupport libvdpau
++ lib.optionals useWayland [
wayland

8
pkgs/development/arduino/arduino-core/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, jdk, ant
, libusb, libusb1, unzip, zlib, ncurses, readline
, libusb-compat-0_1, libusb1, unzip, zlib, ncurses, readline
, withGui ? false, gtk2 ? null, withTeensyduino ? false
/* Packages needed for Teensyduino */
, upx, fontconfig, xorg, gcc
@ -42,7 +42,7 @@ let
glib
gtk2
libpng12
libusb
libusb-compat-0_1
pango
udev
xorg.libSM
@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline
buildInputs = [ jdk ant libusb-compat-0_1 libusb1 unzip zlib ncurses5 readline
] ++ stdenv.lib.optionals withTeensyduino [ upx ];
downloadSrcList = builtins.attrValues externalDownloads;
downloadDstList = builtins.attrNames externalDownloads;
@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
javaPath = lib.makeBinPath [jdk];
# Everything else will be patched into rpath
rpath = (lib.makeLibraryPath [zlib libusb libusb1 readline ncurses5 stdenv.cc.cc]);
rpath = (lib.makeLibraryPath [zlib libusb-compat-0_1 libusb1 readline ncurses5 stdenv.cc.cc]);
installPhase = ''
mkdir -p $out/share/arduino

4
pkgs/development/libraries/garmintools/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libusb }:
{ stdenv, fetchurl, libusb-compat-0_1 }:
stdenv.mkDerivation {
name = "garmintools-0.10";
src = fetchurl {
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/garmintools-0.10.tar.gz";
sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz";
};
buildInputs = [ libusb ];
buildInputs = [ libusb-compat-0_1 ];
meta = {
description = "Provides the ability to communicate with the Garmin Forerunner 305 via the USB interface";
homepage = "https://code.google.com/archive/p/garmintools/"; # community clone at https://github.com/ianmartin/garmintools

4
pkgs/development/libraries/hamlib/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb, pkgconfig,
{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkgconfig,
boost, libtool, perlPackages }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2
tcl libusb pkgconfig boost libtool ];
tcl libusb-compat-0_1 pkgconfig boost libtool ];
configureFlags = [ "--with-perl-binding" "--with-python-binding"
"--with-tcl-binding" "--with-rigmatrix" ];

6
pkgs/development/libraries/libftdi/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, libusb}:
{stdenv, fetchurl, libusb-compat-0_1}:
with stdenv; mkDerivation rec {
name = "libftdi-0.20";
@ -8,9 +8,9 @@ with stdenv; mkDerivation rec {
sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii";
};
buildInputs = [ libusb ];
buildInputs = [ libusb-compat-0_1 ];
propagatedBuildInputs = [ libusb ];
propagatedBuildInputs = [ libusb-compat-0_1 ];
# Hack to avoid TMPDIR in RPATHs.
preFixup = ''rm -rf "$(pwd)" '';

4
pkgs/development/libraries/libnfc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libusb, readline }:
{ stdenv, fetchurl, libusb-compat-0_1, readline }:
stdenv.mkDerivation {
pname = "libnfc";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll";
};
buildInputs = [ libusb readline ];
buildInputs = [ libusb-compat-0_1 readline ];
meta = with stdenv.lib; {
description = "Open source library libnfc for Near Field Communication";

0
pkgs/development/libraries/libusb/default.nix → pkgs/development/libraries/libusb-compat/0.1.nix
View File

4
pkgs/development/libraries/lirc/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3,
alsaLib, xlibsWrapper, libxslt, systemd, libusb, libftdi1 }:
alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }:
stdenv.mkDerivation rec {
name = "lirc-0.10.1";
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig help2man
(python3.withPackages (p: with p; [ pyyaml setuptools ])) ];
buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ];
buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ];
configureFlags = [
"--sysconfdir=/etc"

4
pkgs/development/libraries/openct/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb-compat-0_1
, doxygen, libxslt
}:
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ pcsclite libusb doxygen libxslt ];
buildInputs = [ pcsclite libusb-compat-0_1 doxygen libxslt ];
preInstall = ''
mkdir -p $out/etc

4
pkgs/development/libraries/scmccid/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, patchelf, libusb}:
{stdenv, fetchurl, patchelf, libusb-compat-0_1}:
assert stdenv ? cc && stdenv.cc.libc != null;
@ -18,7 +18,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ patchelf ];
installPhase = ''
RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib
RPATH=${libusb-compat-0_1.out}/lib:${stdenv.cc.libc.out}/lib
for a in proprietary/*/Contents/Linux/*.so*; do
if ! test -L $a; then

4
pkgs/development/libraries/unicap/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }:
{ stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }:
stdenv.mkDerivation rec {
pname = "libunicap";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9";
};
buildInputs = [ libusb libraw1394 dcraw intltool perl v4l-utils ];
buildInputs = [ libusb-compat-0_1 libraw1394 dcraw intltool perl v4l-utils ];
patches = [
# Debian has a patch that fixes the build.

4
pkgs/development/misc/msp430/mspdebug.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libusb, readline ? null }:
{ stdenv, fetchFromGitHub, libusb-compat-0_1, readline ? null }:
let
version = "0.25";
@ -12,7 +12,7 @@ in stdenv.mkDerivation {
sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c";
};
buildInputs = [ libusb readline ];
buildInputs = [ libusb-compat-0_1 readline ];
makeFlags = [ "PREFIX=$(out)" "INSTALL=install" ] ++
(if readline == null then [ "WITHOUT_READLINE=1" ] else []);

4
pkgs/development/mobile/webos/novacomd.nix
View File

@ -1,7 +1,7 @@
{ stdenv,
fetchFromGitHub, fetchpatch,
webos, cmake, pkgconfig,
libusb }:
libusb-compat-0_1 }:
stdenv.mkDerivation rec {
pname = "novacomd";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ];
buildInputs = [ libusb ];
buildInputs = [ libusb-compat-0_1 ];
cmakeFlags = [ "-DWEBOS_TARGET_MACHINE_IMPL=host" ];

4
pkgs/development/mobile/xpwn/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb, openssl }:
{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb-compat-0_1, openssl }:
stdenv.mkDerivation rec {
pname = "xpwn";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [ cmake ];
buildInputs = [ zlib libpng bzip2 libusb openssl ];
buildInputs = [ zlib libpng bzip2 libusb-compat-0_1 openssl ];
meta = with stdenv.lib; {
homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn";

4
pkgs/development/tools/analysis/radare2/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchFromGitHub
, buildPackages
, pkgconfig
, libusb, readline, libewf, perl, zlib, openssl
, libusb-compat-0_1, readline, libewf, perl, zlib, openssl
, libuv, file, libzip, xxHash
, gtk2 ? null, vte ? null, gtkdialog ? null
, python3 ? null
@ -84,7 +84,7 @@ let
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ file readline libusb libewf perl zlib openssl libuv ]
buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ]
++ optional useX11 [ gtkdialog vte gtk2 ]
++ optional rubyBindings [ ruby ]
++ optional pythonBindings [ python3 ]

4
pkgs/development/tools/misc/avrdude/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, yacc, flex, libusb, libelf, libftdi1, readline
{ stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline
# docSupport is a big dependency, disabled by default
, docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null
}:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optionals docSupport "--enable-doc";
buildInputs = [ yacc flex libusb libelf libftdi1 readline ]
buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ]
++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ];
meta = with stdenv.lib; {

4
pkgs/development/tools/misc/blackmagic/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub
, gcc-arm-embedded, libftdi1, libusb, pkgconfig
, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig
, python, pythonPackages
}:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [
libftdi1
libusb
libusb-compat-0_1
python
pythonPackages.intelhex
];

4
pkgs/development/tools/misc/dfu-programmer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libusb }:
{ stdenv, fetchurl, libusb-compat-0_1 }:
let
version = "0.7.2";
in
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
pname = "dfu-programmer";
inherit version;
buildInputs = [ libusb ];
buildInputs = [ libusb-compat-0_1 ];
src = fetchurl {
url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz";

4
pkgs/development/tools/misc/micronucleus/default.nix
View File

@ -1,7 +1,7 @@
{
pkgs
, stdenv
, libusb
, libusb-compat-0_1
, fetchFromGitHub
, lib
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in";
};
buildInputs = [ libusb ];
buildInputs = [ libusb-compat-0_1 ];
makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ];
installPhase = ''

4
pkgs/development/tools/misc/teensy-loader-cli/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb }:
{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }:
stdenv.mkDerivation rec {
pname = "teensy-loader-cli";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1yx8vsh6b29pqr4zb6sx47429i9x51hj9psn8zksfz75j5ivfd5i";
};
buildInputs = [ libusb ];
buildInputs = [ libusb-compat-0_1 ];
nativeBuildInputs = [ go-md2man installShellFiles ];

4
pkgs/development/tools/misc/wishbone-tool/default.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, rustPlatform, libusb }:
{ lib, fetchFromGitHub, rustPlatform, libusb-compat-0_1 }:
let
version = "0.6.9";
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
'';
cargoSha256 = "0d5kcwy0cgxqfxf2xysw65ng84q4knhp4fgvh6dwqhf0nsca9gvs";
buildInputs = [ libusb ];
buildInputs = [ libusb-compat-0_1 ];
meta = with lib; {
description = "Manipulate a Wishbone device over some sort of bridge";

4
pkgs/development/tools/misc/xc3sprog/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchsvn, cmake, libusb, libftdi }:
{ stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }:
# The xc3sprog project doesn't seem to make proper releases, they only put out
# prebuilt binary subversion snapshots on sourceforge.
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
rev = version;
};
buildInputs = [ cmake libusb libftdi ];
buildInputs = [ cmake libusb-compat-0_1 libftdi ];
meta = with stdenv.lib; {
description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG";

6
pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
View File

@ -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/
'';

6
pkgs/misc/cups/drivers/samsung/1.00.37.nix
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/
'';

4
pkgs/misc/cups/drivers/samsung/4.01.17.nix
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";

4
pkgs/misc/drivers/epkowa/default.nix
View File

@ -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
];

4
pkgs/misc/drivers/gutenprint/default.nix
View File

@ -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

4
pkgs/os-specific/linux/g15daemon/default.nix
View File

@ -5,7 +5,7 @@
, fetchpatch
, patchelf
, freetype
, libusb
, libusb-compat-0_1
}:
let
license = lib.licenses.gpl2;
@ -25,7 +25,7 @@ let
sha256 = "1mkrf622n0cmz57lj8w9q82a9dcr1lmyyxbnrghrxzb6gvifnbqk";
};
buildInputs = [ libusb ];
buildInputs = [ libusb-compat-0_1 ];
enableParallelBuilding = true;

4
pkgs/servers/monitoring/lcdproc/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig
, doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }:
, doxygen, freetype, libX11, libftdi, libusb-compat-0_1, libusb1, ncurses, perl }:
stdenv.mkDerivation rec {
pname = "lcdproc";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
"--with-pidfile-dir=/run"
];
buildInputs = [ freetype libX11 libftdi libusb libusb1 ncurses ];
buildInputs = [ freetype libX11 libftdi libusb-compat-0_1 libusb1 ncurses ];
nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ];
# In 0.5.9: gcc: error: libbignum.a: No such file or directory

4
pkgs/tools/bluetooth/obex-data-server/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus }:
{ stdenv, fetchurl, pkgconfig, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }:
stdenv.mkDerivation rec {
name = "obex-data-server-0.4.6";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libusb glib dbus-glib bluez openobex dbus ];
buildInputs = [ libusb-compat-0_1 glib dbus-glib bluez openobex dbus ];
patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ];

4
pkgs/tools/bluetooth/openobex/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, bluez, libusb, cmake }:
{ stdenv, fetchurl, pkgconfig, bluez, libusb-compat-0_1, cmake }:
stdenv.mkDerivation rec {
name = "openobex-1.7.2";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ bluez libusb ];
buildInputs = [ bluez libusb-compat-0_1 ];
configureFlags = [ "--enable-apps" ];

4
pkgs/tools/misc/gnokii/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, perl, gettext, libusb, pkgconfig, bluez
{ stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez
, readline, pcsclite, libical, gtk2, glib, libXpm }:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
perl intltool gettext libusb
perl intltool gettext libusb-compat-0_1
glib gtk2 pkgconfig bluez readline
libXpm pcsclite libical
];

4
pkgs/tools/misc/grub/2.0x.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, flex, bison, python, autoconf, automake, gnulib, libtool
, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig
, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkgconfig
, fuse # only needed for grub-mount
, zfs ? null
, efiSupport ? false
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ bison flex python pkgconfig autoconf automake ];
buildInputs = [ ncurses libusb freetype gettext lvm2 fuse libtool ]
buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ]
++ optional doCheck qemu
++ optional zfsSupport zfs;

4
pkgs/tools/misc/grub/trusted.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
, gettext, ncurses, libusb, freetype, qemu, lvm2
, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2
, for_HP_laptop ? false
}:
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autogen flex bison python autoconf automake ];
buildInputs = [ ncurses libusb freetype gettext lvm2 ]
buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ]
++ optional doCheck qemu;
hardeningDisable = [ "stackprotector" "pic" ];

6
pkgs/tools/misc/pk2cmd/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, libusb, makeWrapper}:
{stdenv, fetchurl, libusb-compat-0_1, makeWrapper}:
stdenv.mkDerivation {
name = "pk2cmd-1.20";
@ -7,7 +7,7 @@ stdenv.mkDerivation {
sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h";
};
makeFlags = [ "LIBUSB=${libusb.dev}" "linux" ];
makeFlags = [ "LIBUSB=${libusb-compat-0_1.dev}" "linux" ];
installPhase = ''
mkdir -p $out/bin $out/share/pk2
@ -16,7 +16,7 @@ stdenv.mkDerivation {
wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2
'';
buildInputs = [ libusb makeWrapper ];
buildInputs = [ libusb-compat-0_1 makeWrapper ];
meta = {
homepage = "https://www.microchip.com/pickit2";

4
pkgs/tools/misc/sixpair/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libusb }:
{ stdenv, fetchurl, libusb-compat-0_1 }:
stdenv.mkDerivation {
name = "sixpair-2007-04-18";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
# hcitool is depricated
patches = [ ./hcitool.patch ];
buildInputs = [ libusb ];
buildInputs = [ libusb-compat-0_1 ];
unpackPhase = ''
cp $src sixpair.c

4
pkgs/tools/misc/urjtag/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison
, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline
, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb-compat-0_1, readline
, python3
, svfSupport ? true
, bsdlSupport ? true
@ -19,7 +19,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gettext autoconf automake libtool bison flex which
subversion makeWrapper readline libftdi libusb python3 ];
subversion makeWrapper readline libftdi libusb-compat-0_1 python3 ];
configureFlags = [
(stdenv.lib.enableFeature svfSupport "svf")

4
pkgs/tools/misc/xburst-tools/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, libusb, libusb1, autoconf, automake, libconfuse, pkgconfig
{ stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig
, gccCross ? null
}:
@ -30,7 +30,7 @@ stdenv.mkDerivation {
dontCrossStrip = true;
nativeBuildInputs = [ autoconf automake pkgconfig ];
buildInputs = [ libusb libusb1 libconfuse ] ++
buildInputs = [ libusb-compat-0_1 libusb1 libconfuse ] ++
stdenv.lib.optional (gccCross != null) gccCross;
meta = {

4
pkgs/tools/security/gnupg/20.nix
View File

@ -4,7 +4,7 @@
# Each of the dependencies below are optional.
# Gnupg can be built without them at the cost of reduced functionality.
, pinentry ? null, guiSupport ? false
, openldap ? null, bzip2 ? null, libusb ? null, curl ? null
, openldap ? null, bzip2 ? null, libusb-compat-0_1 ? null, curl ? null
}:
with stdenv.lib;
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs
= [ readline zlib libgpgerror libgcrypt libassuan libksba pth
openldap bzip2 libusb curl libiconv ];
openldap bzip2 libusb-compat-0_1 curl libiconv ];
patches = [ ./gpgkey2ssh-20.patch ];

4
pkgs/tools/security/libacr38u/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pcsclite , libusb }:
{ stdenv, fetchurl, pkgconfig, pcsclite , libusb-compat-0_1 }:
stdenv.mkDerivation {
version = "1.7.11";
@ -12,7 +12,7 @@ stdenv.mkDerivation {
doCheck = true;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pcsclite libusb ];
buildInputs = [ pcsclite libusb-compat-0_1 ];
preBuild = ''
makeFlagsArray=(usbdropdir="$out/pcsc/drivers");

4
pkgs/tools/security/pcsc-scm-scl011/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, libusb }:
{ stdenv, fetchurl, unzip, libusb-compat-0_1 }:
let
arch = if stdenv.hostPlatform.system == "i686-linux" then "32"
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
cp -r proprietary/*.bundle $out/pcsc/drivers
'';
libPath = stdenv.lib.makeLibraryPath [ libusb ];
libPath = stdenv.lib.makeLibraryPath [ libusb-compat-0_1 ];
fixupPhase = ''
patchelf --set-rpath $libPath \

1
pkgs/top-level/aliases.nix
View File

@ -249,6 +249,7 @@ mapAliases ({
libtxc_dxtn = throw "removed 2020-03-16, now integrated in Mesa";
libtxc_dxtn_s2tc = throw "removed 2020-03-16, now integrated in Mesa";
libudev = udev; # added 2018-04-25
libusb = libusb-compat-0_1; # added 2020-04-28
libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10
libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09
links = links2; # added 2016-01-31

2
pkgs/top-level/all-packages.nix
View File

@ -13356,7 +13356,7 @@ in
liburcu = callPackage ../development/libraries/liburcu { };
libusb = callPackage ../development/libraries/libusb {};
libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix {};
libusb1 = callPackage ../development/libraries/libusb1 {
inherit (darwin) libobjc;