From 90891496d8ac11658f9c8bf3560eaf42b2369527 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 May 2008 11:07:20 +0000 Subject: [PATCH] * Fixed libgnomeprintui. svn path=/nixpkgs/branches/stdenv-updates/; revision=11868 --- pkgs/desktops/gnome/default.nix | 15 +++++++++++---- pkgs/desktops/gnome/libgnomeprintui.nix | 13 ------------- 2 files changed, 11 insertions(+), 17 deletions(-) delete mode 100644 pkgs/desktops/gnome/libgnomeprintui.nix diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 4569ea911b6..942835593b7 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -131,10 +131,17 @@ rec { propagatedBuildInputs = [libxml2 libart_lgpl]; }; - libgnomeprintui = import ./libgnomeprintui.nix { - inherit fetchurl stdenv perl perlXMLParser pkgconfig; - inherit gtk libgnomeprint libgnomecanvas gnomeicontheme; - input = desktop.libgnomeprintui; + libgnomeprintui = stdenv.mkDerivation { + inherit (desktop.libgnomeprintui) name src; + + buildInputs = [ + perl perlXMLParser pkgconfig gtk libgnomecanvas gnomeicontheme + gettext + ]; + + propagatedBuildInputs = [ + libgnomeprint + ]; }; gtkhtml = import ./gtkhtml.nix { diff --git a/pkgs/desktops/gnome/libgnomeprintui.nix b/pkgs/desktops/gnome/libgnomeprintui.nix deleted file mode 100644 index e1980a0dab1..00000000000 --- a/pkgs/desktops/gnome/libgnomeprintui.nix +++ /dev/null @@ -1,13 +0,0 @@ -{input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk, libgnomeprint, libgnomecanvas, gnomeicontheme}: - -stdenv.mkDerivation { - inherit (input) name src; - - buildInputs = [ - perl perlXMLParser pkgconfig gtk libgnomecanvas gnomeicontheme - ]; - - propagatedBuildInputs = [ - libgnomeprint - ]; -}