Author: eelco
Date: Thu Jul 7 18:16:03 2011
New Revision: 27636
URL: https://svn.nixos.org/websvn/nix/?rev=27636&sc=1
Log:
* PolKit updated to 0.101.
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/policykit/default.nix
nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit/default.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/policykit/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/policykit/default.nix
Thu Jul 7 18:15:34 2011 (r27635)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/policykit/default.nix
Thu Jul 7 18:16:03 2011 (r27636)
@@ -29,6 +29,6 @@
meta = {
homepage = http://www.freedesktop.org/wiki/Software/PolicyKit;
- description = "A toolkit for defining and handling the policy that allows
unprivileged processes to speak to privileged processes";
+ description = "A toolkit for defining and handling the policy that allows
unprivileged processes to speak to privileged processes (obsolete)";
};
}
Modified: nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit/default.nix
Thu Jul 7 18:15:34 2011 (r27635)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/polkit/default.nix
Thu Jul 7 18:16:03 2011 (r27636)
@@ -1,38 +1,44 @@
-{ stdenv, fetchurl, pkgconfig, glib, eggdbus, expat, pam, intltool, gettext,
- gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, gettext
+, gobjectIntrospection }:
let
- system="/var/run/current-system/sw";
+
+ system = "/var/run/current-system/sw";
+
foolVars = {
LOCALSTATE = "/var";
SYSCONF = "/etc";
- LIBEXEC = "${system}/libexec/polkit-1";
LIB = "${system}/lib";
DATA = "${system}/share";
};
+
in
stdenv.mkDerivation rec {
- name = "polkit-0.99";
+ name = "polkit-0.101";
src = fetchurl {
url = "http://hal.freedesktop.org/releases/${name}.tar.gz";;
- sha256 = "0gsqnc5x6angma7paw0hnl5cagqimsj5f022a5vzc8n8dv1cf4pn";
+ sha256 = "06wz7zvmh89h2m4k8nik745fp1i9q92h5sgarpbj7kjg1rv6azwj";
};
- buildInputs = [ pkgconfig glib eggdbus expat pam intltool gettext
- gobjectIntrospection ];
+ buildInputs =
+ [ pkgconfig glib expat pam intltool gobjectIntrospection ];
- preConfigure=''
- configureFlags="--libexecdir=$out/libexec/polkit-1"
- '';
+ configureFlags = "--libexecdir=$(out)/libexec/polkit-1";
# Ugly hack to overwrite hardcoded directories
# TODO: investigate a proper patch which will be accepted upstream
CFLAGS = stdenv.lib.concatStringsSep " "
( map (var: ''-DPACKAGE_${var}_DIR=\""${builtins.getAttr var
foolVars}"\"'')
- (builtins.attrNames foolVars) );
+ (builtins.attrNames foolVars) );
+ makeFlags =
+ ''
+ INTROSPECTION_GIRDIR=$(out)/share/gir-1.0
+ INTROSPECTION_TYPELIBDIR=$(out)lib/girepository-1.0
+ '';
+
postInstall =
''
# Allow some files with paranoid permissions to be stripped in
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
