diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-27 08:17:19 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-27 08:17:19 -0700 |
| commit | bd5f2c96380d60629fb46c1e99f41233a3ae9f58 (patch) | |
| tree | d59c8c44a841c63f4211688e036c53753bb50412 /pkgs/misc/cups/default.nix | |
| parent | e1f78bf677e10c6870b416148eef1b2755498097 (diff) | |
| parent | 93ec36702e3ced8202bd93f12d53e2dfb7c898e0 (diff) | |
| download | nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.tar nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.tar.gz nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.tar.bz2 nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.tar.lz nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.tar.xz nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.tar.zst nixpkgs-bd5f2c96380d60629fb46c1e99f41233a3ae9f58.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/misc/cups/default.nix')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 0018a2762e7..bcd27d68ce0 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl +{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam , dbus, acl, gmp, xdg_utils , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ] ++ optionals stdenv.isLinux [ pam dbus.libs acl xdg_utils ] ; - propagatedBuildInputs = [ openssl gmp ]; + propagatedBuildInputs = [ gmp ]; configureFlags = [ "--localstatedir=/var" |