usbredir: request libusb1 directly

Also, fix the website there, and tidy up the spice-gtk derivation, which
makes use of libusb1 too.
This commit is contained in:
Florian Klink 2020-04-24 23:38:18 +02:00
parent eac6c63db1
commit d0b9aa6fa2
3 changed files with 30 additions and 31 deletions

View File

@ -1,35 +1,36 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, pkgconfig , acl
, cyrus_sasl
, docbook_xsl
, epoxy
, gettext
, gobject-introspection
, gst_all_1
, gtk-doc
, gtk3
, json-glib
, libcacard
, libdrm
, libjpeg_turbo
, libopus
, libsoup
, libusb1
, lz4
, meson , meson
, ninja , ninja
, openssl
, perl
, phodav
, pixman
, pkgconfig
, polkit
, python3 , python3
, spice-protocol , spice-protocol
, gettext
, openssl
, pixman
, gobject-introspection
, libjpeg_turbo
, zlib
, cyrus_sasl
, usbredir , usbredir
, libsoup
, polkit
, acl
, usbutils , usbutils
, vala , vala
, gtk3 , zlib
, epoxy
, libdrm
, gst_all_1
, phodav
, libopus
, gtk-doc
, json-glib
, lz4
, libcacard
, perl
, docbook_xsl
, withPolkit ? true , withPolkit ? true
}: }:
@ -99,9 +100,10 @@ stdenv.mkDerivation rec {
libcacard libcacard
libdrm libdrm
libjpeg_turbo libjpeg_turbo
libopus
libusb1
lz4 lz4
openssl openssl
libopus
phodav phodav
pixman pixman
spice-protocol spice-protocol

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libusb }: { stdenv, fetchurl, pkgconfig, libusb1 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "usbredir"; pname = "usbredir";
@ -12,14 +12,13 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_CFLAGS_COMPILE = "-Wno-error";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libusb ]; propagatedBuildInputs = [ libusb1 ];
propagatedBuildInputs = [ libusb ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "USB traffic redirection protocol"; description = "USB traffic redirection protocol";
homepage = "http://spice-space.org/page/UsbRedir"; homepage = "https://www.spice-space.org/usbredir.html";
license = licenses.lgpl21; license = licenses.lgpl21;
maintainers = [ maintainers.offline ]; maintainers = [ maintainers.offline ];

View File

@ -14793,9 +14793,7 @@ in
ustr = callPackage ../development/libraries/ustr { }; ustr = callPackage ../development/libraries/ustr { };
usbredir = callPackage ../development/libraries/usbredir { usbredir = callPackage ../development/libraries/usbredir { };
libusb = libusb1;
};
uthash = callPackage ../development/libraries/uthash { }; uthash = callPackage ../development/libraries/uthash { };