diff options
| author | Peter Hoeg <peter@hoeg.com> | 2017-11-30 23:23:33 +0800 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-12-07 07:22:39 +0000 |
| commit | e5715d94645a46c26d09c633214e5421db758d2c (patch) | |
| tree | ea31e6fd38577c89e9d804f960a1ea93dabe95fc /pkgs/misc | |
| parent | dc4200f93462c6654386a47975a4585671bbb8c4 (diff) | |
| download | nixlib-e5715d94645a46c26d09c633214e5421db758d2c.tar nixlib-e5715d94645a46c26d09c633214e5421db758d2c.tar.gz nixlib-e5715d94645a46c26d09c633214e5421db758d2c.tar.bz2 nixlib-e5715d94645a46c26d09c633214e5421db758d2c.tar.lz nixlib-e5715d94645a46c26d09c633214e5421db758d2c.tar.xz nixlib-e5715d94645a46c26d09c633214e5421db758d2c.tar.zst nixlib-e5715d94645a46c26d09c633214e5421db758d2c.zip | |
cups: 2.2.2 -> 2.2.6
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/default.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index d005f6becadb..9d8134d21561 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 +{ stdenv, fetchurl, fetchpatch, pkgconfig, zlib, libjpeg, libpng, libtiff, pam , dbus, systemd, acl, gmp, darwin , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null }: @@ -9,18 +9,26 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "cups-${version}"; - version = "2.2.2"; + version = "2.2.6"; passthru = { inherit version; }; src = fetchurl { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "1xp4ji4rz3xffsz6w6nd60ajxvvihn02pkyp2l4smhqxbmyvp2gm"; + sha256 = "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"; }; outputs = [ "out" "lib" "dev" "man" ]; + patches = [ + (fetchpatch { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/cups-systemd-socket.patch?h=packages/cups"; + sha256 = "1ddgdlg9s0l2ph6l8lx1m1lx6k50gyxqi3qiwr44ppq1rxs80ny5"; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ] ++ optionals stdenv.isDarwin (with darwin; [ @@ -39,6 +47,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--sysconfdir=/etc" + "--with-rundir=/run" "--with-systemd=\${out}/lib/systemd/system" "--enable-raw-printing" "--enable-threads" @@ -54,11 +63,6 @@ stdenv.mkDerivation rec { "--disable-launchd" ]; - # XXX: Hackery until https://github.com/NixOS/nixpkgs/issues/24693 - preBuild = if stdenv.isDarwin then '' - export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks - '' else null; - installFlags = [ # Don't try to write in /var at build time. "CACHEDIR=$(TMPDIR)/dummy" |