diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-10-13 15:50:37 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-10-13 16:10:58 +0200 |
| commit | 4e6826a3b2b4e0e95d0af6ef83360962c78125cb (patch) | |
| tree | 2a6be7c8cc62a75a4cc5c4348663a00726e47a38 /pkgs/misc | |
| parent | 84c09b109e0bf185c68d90770f275930d02fac24 (diff) | |
| parent | b5697c6954d4b261d354cb6630385fe280f15ef9 (diff) | |
| download | nixpkgs-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.tar nixpkgs-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.tar.gz nixpkgs-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.tar.bz2 nixpkgs-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.tar.lz nixpkgs-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.tar.xz nixpkgs-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.tar.zst nixpkgs-4e6826a3b2b4e0e95d0af6ef83360962c78125cb.zip | |
Merge branch 'staging-next'
It's not perfect, but I think we can deal with the rest of the regressions directly on master, so that this process does not stall.
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/cups-pk-helper.nix | 10 | ||||
| -rw-r--r-- | pkgs/misc/cups/default.nix | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index 5e7596032b3..6534d300e82 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, polkit, cups }: +{ stdenv, fetchurl, intltool, pkgconfig, glib, polkit, cups, fetchpatch }: stdenv.mkDerivation rec { version = "0.2.6"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ glib polkit cups ]; + patches = [ + # Don't use etc/dbus-1/system.d + (fetchpatch { + url = "https://gitlab.freedesktop.org/cups-pk-helper/cups-pk-helper/merge_requests/2.patch"; + sha256 = "1kamhr5kn8c1y0q8xbip0fgr7maf3dyddlvab4n0iypk7rwwikl0"; + }) + ]; + meta = with stdenv.lib; { description = "PolicyKit helper to configure cups with fine-grained privileges"; homepage = http://www.freedesktop.org/wiki/Software/cups-pk-helper/; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 6e27fdb0a52..c7df3f333b6 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { ] ++ optionals stdenv.isLinux [ "--enable-dbus" "--enable-pam" + "--with-dbusdir=${placeholder "out"}/share/dbus-1" ] ++ optional (libusb != null) "--enable-libusb" ++ optional (gnutls != null) "--enable-ssl" ++ optional (avahi != null) "--enable-avahi" @@ -81,7 +82,6 @@ stdenv.mkDerivation rec { "STATEDIR=$(TMPDIR)/dummy" # Idem for /etc. "PAMDIR=$(out)/etc/pam.d" - "DBUSDIR=$(out)/etc/dbus-1" "XINETD=$(out)/etc/xinetd.d" "SERVERROOT=$(out)/etc/cups" # Idem for /usr. |