From 7cec6e4f5253f15f91185d44314de990be42bfef Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 4 Nov 2009 07:33:27 +0000 Subject: [PATCH] * Fix startup-notification. svn path=/nixpkgs/branches/xorg-7.5/; revision=18087 --- pkgs/desktops/gnome-2.28/default.nix | 3 +-- .../gnome-2.28/platform/startup-notification/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 5a5cc9dbecf3..9b80276015de 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -123,8 +123,7 @@ rec { # Freedesktop library startup_notification = import ./platform/startup-notification { - inherit (pkgs) stdenv fetchurl pkgconfig; - inherit (pkgs.xlibs) libX11 libxcb libICE xcbutil libSM; + inherit (pkgs) stdenv fetchurl pkgconfig xlibs; }; # Required for nautilus diff --git a/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix b/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix index b54f13a39b22..b82b8a50992a 100644 --- a/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix +++ b/pkgs/desktops/gnome-2.28/platform/startup-notification/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libX11, libxcb, libICE, xcbutil, libSM}: +{ stdenv, fetchurl, pkgconfig, xlibs }: stdenv.mkDerivation { name = "startup-notification-0.9"; @@ -6,5 +6,5 @@ stdenv.mkDerivation { url = mirror://gnome/sources/startup-notification/0.9/startup-notification-0.9.tar.bz2; sha256 = "03aqkgv8d29yx2vmv6bfdlxq3ahagrb7dbsvhd5d9acy6znimpk1"; }; - buildInputs = [ pkgconfig libX11 libxcb libICE xcbutil libSM ]; + buildInputs = [ pkgconfig xlibs.xlibs xlibs.xcbutil ]; }