diff options
| author | Florian Klink <flokli@flokli.de> | 2020-04-24 23:43:07 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-04-27 12:19:12 +0200 |
| commit | 2c621ff4f4ad4eb2467fc9f98bab327a25f2e3ac (patch) | |
| tree | db9b8c196d0433222412520c5f96a667e024c54b /pkgs/misc/cups | |
| parent | f3a5fd548a76282b0fd808e118b09baa680105e3 (diff) | |
cups: request libusb1 directly
Diffstat (limited to 'pkgs/misc/cups')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index f229ced8936d..b16c0645cda8 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -13,7 +13,7 @@ , acl , gmp , darwin -, libusb ? null +, libusb1 ? null , gnutls ? null , avahi ? null , libpaper ? null @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { 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 ] ++ optional enableSystemd systemd # 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-pam" "--with-dbusdir=${placeholder "out"}/share/dbus-1" - ] ++ optional (libusb != null) "--enable-libusb" + ] ++ optional (libusb1 != null) "--enable-libusb" ++ optional (gnutls != null) "--enable-ssl" ++ optional (avahi != null) "--enable-avahi" ++ optional (libpaper != null) "--enable-libpaper" |