From b1b09c151099268275d384e8599c260e5f386af5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 6 Oct 2011 11:56:18 +0000 Subject: [PATCH] * gnome-keyring: drop the (unused) dependency on HAL. svn path=/nixpkgs/trunk/; revision=29692 --- pkgs/desktops/gnome-2.28/default.nix | 2 +- pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 36eb7b70be2b..e486cac465ea 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -182,7 +182,7 @@ pkgs.makeOverridable #### DESKTOP gnome_keyring = import ./desktop/gnome-keyring { - inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam hal python; + inherit (pkgs) stdenv fetchurl pkgconfig dbus libgcrypt libtasn1 pam python; inherit (pkgs.gtkLibs) glib gtk; inherit intltool GConf; }; diff --git a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix index fdb885bf595c..f49cb1c2d1c0 100644 --- a/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-2.28/desktop/gnome-keyring/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, hal, python, glib, gtk, intltool, GConf}: +{stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, gtk, intltool, GConf}: stdenv.mkDerivation { name = "gnome-keyring-2.28.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1d6av3cq32ypq9f9mv7f9bcqkkdqgbvbb831kad62smczvqk8chv"; }; - buildInputs = [ pkgconfig dbus.libs libgcrypt pam hal python gtk intltool GConf ]; + buildInputs = [ pkgconfig dbus.libs libgcrypt pam python gtk intltool GConf ]; propagatedBuildInputs = [ glib libtasn1 ]; }