mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

* Sigh. For PolicyKit, follow the upstream names, otherwise I'll get

Browse source 
a headache.  "polkit" is the new, unstable release series.
  "policykit" is the old series.  (See
  http://lists.freedesktop.org/archives/polkit-devel/2009-February/000106.html
  for an "explanation" of the name change.)  It seems that for HAL we
  need to revert to the old "policykit", since it doesn't compile
  against "polkit".

svn path=/nixpkgs/trunk/; revision=17425
This commit is contained in:
Eelco Dolstra 2009-09-25 20:06:36 +00:00
parent 931a5936cb
commit 7dd58cda98
6 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/desktops/gnome/default.nix
View file

@ -329,7 +329,7 @@ rec {
buildInputs = [
pkgconfig perl perlXMLParser GConf gnomedocutils
gtk libgnome libgnomeui gettext libxslt intltool
policy_kit dbus_glib
polkit dbus_glib
];
configureFlags = "--disable-scrollkeeper";

4
pkgs/development/libraries/console-kit/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, libX11, policy_kit }:
{ stdenv, fetchurl, pkgconfig, dbus_glib, zlib, pam, glib, libX11, polkit }:
stdenv.mkDerivation rec {
name = "console-kit-0.3.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0b834ly6l8l76awr2pn2xz3ic6ilhfif4h3nsi96ffa91n09ydk0";
};
buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 policy_kit ];
buildInputs = [ pkgconfig dbus_glib zlib pam glib libX11 polkit ];
configureFlags = "--enable-pam-module --with-pam-module-dir=$(out)/lib/security --localstatedir=/var --sysconfdir=/etc";

16
pkgs/development/libraries/policy-kit/0.9.nix
View file

@ -1,16 +0,0 @@
args: with args;
assert stdenv ? glibc;
stdenv.mkDerivation rec {
name = "PolicyKit-0.9";
src = fetchurl {
url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
sha256 = "f40c7c6bec19d7dba2335bddcffd0457494409a0dfce11d888c748dc892e80b7";
};
buildInputs = [
pkgconfig expat intltool glib dbus dbus_glib pam gettext
];
}

22
pkgs/development/libraries/policykit/default.nix Normal file
View file

@ -0,0 +1,22 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, expat, pam
, intltool, gettext }:
stdenv.mkDerivation rec {
name = "policykit-0.9";
src = fetchurl {
url = http://hal.freedesktop.org/releases/PolicyKit-0.9.tar.gz;
sha256 = "1dw05s4xqj67i3c13knzl04l8jap0kywzpav6fidpmqrximpq37l";
};
buildInputs = [ pkgconfig glib dbus.libs dbus_glib expat pam intltool gettext ];
configureFlags = "--localstatedir=/var";
installFlags = "localstatedir=$(TMPDIR)/var"; # keep `make install' happy
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";
};
}

0
pkgs/development/libraries/policy-kit/default.nix → pkgs/development/libraries/polkit/default.nix
View file

12
pkgs/top-level/all-packages.nix
View file

@ -3011,7 +3011,7 @@ let
};
console_kit = import ../development/libraries/console-kit {
inherit stdenv fetchurl pkgconfig dbus_glib zlib pam policy_kit;
inherit stdenv fetchurl pkgconfig dbus_glib zlib pam polkit;
inherit (gtkLibs) glib;
inherit (xlibs) libX11;
};
@ -4080,16 +4080,14 @@ let
inherit (xlibs) libXi libSM libXmu libXext libX11;
};
policy_kit = import ../development/libraries/policy-kit {
polkit = import ../development/libraries/polkit {
inherit stdenv fetchurl pkgconfig eggdbus expat pam intltool gettext;
inherit (gtkLibs) glib;
};
policy_kit_0_9 = import ../development/libraries/policy-kit/0.9.nix {
inherit stdenv fetchurl pkgconfig expat pam intltool gettext
dbus_glib;
policykit = import ../development/libraries/policykit {
inherit stdenv fetchurl pkgconfig dbus dbus_glib expat pam intltool gettext;
inherit (gtkLibs) glib;
dbus = dbus.libs;
};
poppler = makeOverridable (import ../development/libraries/poppler) {
@ -8052,7 +8050,7 @@ let
gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2
libcm python dbus dbus_glib ncurses which libxml2Python
iconnamingutils openssl hal samba fam libgcrypt libtasn1
xmlto docbook2x docbook_xsl intltool enchant isocodes policy_kit
xmlto docbook2x docbook_xsl intltool enchant isocodes polkit
libproxy sqlite;
});