diff options
| author | Michael Eden <themichaeleden@gmail.com> | 2019-03-20 16:37:47 -0400 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-04-16 19:03:22 +0200 |
| commit | d8d8a9cddbc21d4fe7169f9e3a8511a68ac02879 (patch) | |
| tree | 4645b37146ca500347f7018b24269f875c0edd90 /pkgs/development/libraries/polkit | |
| parent | 65ca3ab5f492cba003b6ae289ac962f16df5b873 (diff) | |
polkit: optional introspection and cross compilation fixes
Diffstat (limited to 'pkgs/development/libraries/polkit')
| -rw-r--r-- | pkgs/development/libraries/polkit/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 737a9a5badf2..f47d2713f1a4 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -2,6 +2,7 @@ , intltool, spidermonkey_52 , gobject-introspection, libxslt, docbook_xsl, dbus , docbook_xml_dtd_412, gtk-doc, coreutils , useSystemd ? stdenv.isLinux, systemd +, withGnome ? true , doCheck ? stdenv.isLinux }: @@ -42,11 +43,12 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; # small man pages in $bin nativeBuildInputs = - [ gtk-doc pkgconfig autoreconfHook intltool gobject-introspection perl ] + [ glib gtk-doc pkgconfig intltool perl ] ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages buildInputs = - [ glib expat pam spidermonkey_52 gobject-introspection ] - ++ stdenv.lib.optional useSystemd systemd; + [ glib expat pam spidermonkey_52 ] + ++ 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 @@ -73,7 +75,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS - "--enable-introspection" + (if withGnome then "--enable-introspection" else "--disable-introspection") ] ++ stdenv.lib.optional (!doCheck) "--disable-test"; makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; |