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

Merge pull request #86165 from jtojnar/libusb-compat-rename

Browse Source
This commit is contained in:
Jan Tojnar
2020-04-29 08:26:08 +02:00
committed by GitHub
parent 6015d03ef1 45edbeb81d
commit 2b5e2ffe0a
61 changed files with 129 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 \