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

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

@ -9,7 +9,7 @@
let
system = "/run/current-system/sw";
setuid = "/run/wrappers/bin"; #TODO: from <nixos> config.security.wrapperDir;
setuid = "/run/wrappers/bin";
in
@ -40,11 +40,13 @@ stdenv.mkDerivation rec {
[ glib gtk-doc pkgconfig intltool perl ]
++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
buildInputs =
[ glib expat pam spidermonkey_60 ]
[ expat pam spidermonkey_60 ]
++ stdenv.lib.optional useSystemd systemd
++ 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 = ''
chmod +x test/mocklibc/bin/mocklibc{,-test}.in