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

cups: request libusb1 directly

Browse Source
This commit is contained in:
Florian Klink 2020-04-24 23:43:07 +02:00
parent f3a5fd548a
commit 2c621ff4f4
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/misc/cups/default.nix
View File

@ -13,7 +13,7 @@
, acl , acl
, gmp , gmp
, darwin , darwin
, libusb ? null , libusb1 ? null
, gnutls ? null , gnutls ? null
, avahi ? null , avahi ? null
, libpaper ? null , libpaper ? null
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig removeReferencesTo ]; nativeBuildInputs = [ pkgconfig removeReferencesTo ];
buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ] buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ]
++ optionals stdenv.isLinux [ avahi pam dbus ] ++ optionals stdenv.isLinux [ avahi pam dbus ]
++ optional enableSystemd systemd ++ optional enableSystemd systemd
# Separate from above only to not modify order, to avoid mass rebuilds; merge this with the above at next big change. # Separate from above only to not modify order, to avoid mass rebuilds; merge this with the above at next big change.
@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
"--enable-dbus" "--enable-dbus"
"--enable-pam" "--enable-pam"
"--with-dbusdir=${placeholder "out"}/share/dbus-1" "--with-dbusdir=${placeholder "out"}/share/dbus-1"
] ++ optional (libusb != null) "--enable-libusb" ] ++ optional (libusb1 != null) "--enable-libusb"
++ optional (gnutls != null) "--enable-ssl" ++ optional (gnutls != null) "--enable-ssl"
++ optional (avahi != null) "--enable-avahi" ++ optional (avahi != null) "--enable-avahi"
++ optional (libpaper != null) "--enable-libpaper" ++ optional (libpaper != null) "--enable-libpaper"

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

@ -25191,9 +25191,7 @@ in
clinfo = callPackage ../tools/system/clinfo { }; clinfo = callPackage ../tools/system/clinfo { };
cups = callPackage ../misc/cups { cups = callPackage ../misc/cups { };
libusb = libusb1;
};
cups-filters = callPackage ../misc/cups/filters.nix { }; cups-filters = callPackage ../misc/cups/filters.nix { };