pyrox.dev
Merge pull request #70453 from worldofpeace/polkit-propagate-glib
polkit: propagate glib, other cleanups
authored by worldofpeace and committed by GitHub e6149855 53a97c34
+6
-4
pkgs/development/libraries/polkit/default.nix
+6
-4
pkgs/development/libraries/polkit/default.nix
···
9
9
let
10
10
11
11
system = "/run/current-system/sw";
12
-
setuid = "/run/wrappers/bin"; #TODO: from <nixos> config.security.wrapperDir;
12
+
setuid = "/run/wrappers/bin";
13
13
14
14
in
15
15
···
40
40
[ glib gtk-doc pkgconfig intltool perl ]
41
41
++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
42
42
buildInputs =
43
-
[ glib expat pam spidermonkey_60 ]
43
+
[ expat pam spidermonkey_60 ]
44
44
++ stdenv.lib.optional useSystemd systemd
45
45
++ stdenv.lib.optional withGnome gobject-introspection;
46
46
47
-
NIX_CFLAGS_COMPILE = " -Wno-deprecated-declarations "; # for polkit 0.114 and glib 2.56
47
+
propagatedBuildInputs = [
48
+
glib # in .pc Requires
49
+
];
48
50
49
51
preConfigure = ''
50
52
chmod +x test/mocklibc/bin/mocklibc{,-test}.in
···
83
85
];
84
86
85
87
inherit doCheck;
86
-
checkInputs = [dbus];
88
+
checkInputs = [ dbus ];
87
89
checkPhase = ''
88
90
# tests need access to the system bus
89
91
dbus-run-session --config-file=${./system_bus.conf} -- sh -c 'DBUS_SYSTEM_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS make check'