diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-15 09:55:15 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-05-15 09:55:15 +0000 |
| commit | 062c48db4bf2a097041c49b4ddd160c55d4a6867 (patch) | |
| tree | 3ce8a208cf45bde45875961cbd82651d7cfec142 | |
| parent | 0e8261b0bea737722277accee1ed30f504e3ba21 (diff) | |
| download | nixlib-062c48db4bf2a097041c49b4ddd160c55d4a6867.tar nixlib-062c48db4bf2a097041c49b4ddd160c55d4a6867.tar.gz nixlib-062c48db4bf2a097041c49b4ddd160c55d4a6867.tar.bz2 nixlib-062c48db4bf2a097041c49b4ddd160c55d4a6867.tar.lz nixlib-062c48db4bf2a097041c49b4ddd160c55d4a6867.tar.xz nixlib-062c48db4bf2a097041c49b4ddd160c55d4a6867.tar.zst nixlib-062c48db4bf2a097041c49b4ddd160c55d4a6867.zip | |
Start migrating to polkit-0.9.6
svn path=/nixpkgs/trunk/; revision=21786
| -rw-r--r-- | pkgs/development/libraries/polkit/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index fa802a661cb9..ac6f10a09b99 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext }: +{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext, + gobjectIntrospection }: stdenv.mkDerivation rec { - name = "polkit-0.92"; + name = "polkit-0.96"; src = fetchurl { url = "http://hal.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "18x4xp4m14fm4aayra4njh82g2jzf6ccln40yybmhxqpb5a3nii8"; + sha256 = "0jh5v0dhf9msvmfmr9d67563m64gq5l96m9jax9abchhfa8wl9il"; }; - buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext ]; + buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext + gobjectIntrospection ]; - configureFlags = "--localstatedir=/var"; + configureFlags = "--localstatedir=/var --sysconfdir=/etc"; +# TODO: PACKAGE_DATA_DIR, PACKAGE_LIBEXEC_DIR, PACKAGE_LIB_DIR installFlags = "localstatedir=$(TMPDIR)/var"; # keep `make install' happy @@ -19,10 +22,6 @@ stdenv.mkDerivation rec { # Allow some files with paranoid permissions to be stripped in # the fixup phase. chmod a+rX -R $out - - # Fix the pathname in the frobnicate example. - substituteInPlace $out/share/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy \ - --replace /usr/bin/pk-example-frobnicate $out/bin/pk-example-frobnicate ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1bd8fbcb571..13115100cf53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5019,7 +5019,8 @@ let }; polkit = import ../development/libraries/polkit { - inherit stdenv fetchurl pkgconfig eggdbus expat pam intltool gettext glib; + inherit stdenv fetchurl pkgconfig eggdbus expat pam intltool gettext glib + gobjectIntrospection; }; policykit = makeOverridable (import ../development/libraries/policykit) { |