Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 53a97c34478e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e6149855b15a
Choose a head ref
  • 4 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 5, 2019

  1. polkit: propagate glib 

    polkit-gobject-1.pc has glib in Requires, and polkit-agent-1.pc
requires polkit-gobject-1.
    @worldofpeace
    worldofpeace committed Oct 5, 2019
    Copy the full SHA
    a61db21 View commit details

  2. polkit: drop -Wno-deprecated-declarations 

    appears to be uneeded.
    @worldofpeace
    worldofpeace committed Oct 5, 2019
    Copy the full SHA
    670c000 View commit details

  3. polkit: drop obsolete comments, whitespace

    @worldofpeace
    worldofpeace committed Oct 5, 2019
    Copy the full SHA
    e570377 View commit details

Commits on Oct 9, 2019

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

    polkit: propagate glib, other cleanups
    @worldofpeace
    worldofpeace authored Oct 9, 2019
    Copy the full SHA
    e614985 View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/development/libraries/polkit/default.nix
10 changes: 6 additions & 4 deletions pkgs/development/libraries/polkit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
@@ -83,7 +85,7 @@ stdenv.mkDerivation rec {
];

inherit doCheck;
checkInputs = [dbus];
checkInputs = [ dbus ];
checkPhase = ''
# 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'