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

Merge pull request #70453 from worldofpeace/polkit-propagate-glib

Browse Source 
polkit: propagate glib, other cleanups
This commit is contained in:
worldofpeace 2019-10-09 21:42:30 +00:00 committed by GitHub
commit e6149855b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/polkit/default.nix
View File

@ -9,7 +9,7 @@
let let
system = "/run/current-system/sw"; system = "/run/current-system/sw";
setuid = "/run/wrappers/bin"; #TODO: from <nixos> config.security.wrapperDir; setuid = "/run/wrappers/bin";
in in
@ -40,11 +40,13 @@ stdenv.mkDerivation rec {
[ glib gtk-doc pkgconfig intltool perl ] [ glib gtk-doc pkgconfig intltool perl ]
++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
buildInputs = buildInputs =
[ glib expat pam spidermonkey_60 ] [ expat pam spidermonkey_60 ]
++ stdenv.lib.optional useSystemd systemd ++ stdenv.lib.optional useSystemd systemd
++ stdenv.lib.optional withGnome gobject-introspection; ++ stdenv.lib.optional withGnome gobject-introspection;
NIX_CFLAGS_COMPILE = " -Wno-deprecated-declarations "; # for polkit 0.114 and glib 2.56 propagatedBuildInputs = [
glib # in .pc Requires
];
preConfigure = '' preConfigure = ''
chmod +x test/mocklibc/bin/mocklibc{,-test}.in chmod +x test/mocklibc/bin/mocklibc{,-test}.in
@ -83,7 +85,7 @@ stdenv.mkDerivation rec {
]; ];
inherit doCheck; inherit doCheck;
checkInputs = [dbus]; checkInputs = [ dbus ];
checkPhase = '' checkPhase = ''
# tests need access to the system bus # tests need access to the system bus
dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check' dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check'