From 10f49c84dd23339ac8b7707db3e27d4c5c915338 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 19 May 2015 14:46:45 +0200 Subject: Remove last reference to gnome3.gnome_icon_theme --- pkgs/applications/office/gnumeric/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index e82ce2d7b9ed..14e130ba1ffc 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser -, goffice, makeWrapper, gtk3, gnome_icon_theme, gnome3 +, gnome3, makeWrapper, gtk3 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # ToDo: optional libgda, python, introspection? buildInputs = [ pkgconfig intltool perl perlXMLParser - goffice gtk3 makeWrapper + gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme ]; preFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10143e76d5d9..d582114946cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11114,9 +11114,7 @@ let inherit (gnome) GConf; }; - gnumeric = callPackage ../applications/office/gnumeric { - inherit (gnome3) goffice gnome_icon_theme; - }; + gnumeric = callPackage ../applications/office/gnumeric { }; gnunet = callPackage ../applications/networking/p2p/gnunet { }; -- cgit 1.4.1