libusb-compat-0_1: rename from libusb
This commit is contained in:
@@ -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
|
||||
];
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user