From 99b14de505df21a5b5cc6636ca679f7ac179d8ba Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 18 May 2015 13:05:26 +0200
Subject: [PATCH] Fix evaluation of goffice 0.8 across gnome updates

---
 pkgs/desktops/gnome-3/3.16/default.nix | 6 ++++++
 pkgs/top-level/all-packages.nix        | 8 +-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 6ec1ee011f53..6243b2dd6d40 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -279,6 +279,12 @@ rec {
 
   goffice = callPackage ./misc/goffice { };
 
+  goffice_0_8 = callPackage ./misc/goffice/0.8.nix { 
+    inherit (pkgs.gnome2) libglade libgnomeui;
+    gconf = pkgs.gnome2.GConf;
+    libart = pkgs.gnome2.libart_lgpl;
+  };
+
   gitg = callPackage ./misc/gitg { 
     webkitgtk = webkitgtk24x;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b38bef1fc24..5b89bdfa81b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11068,15 +11068,9 @@ let
     gconf = gnome2.GConf;
     guile = guile_1_8;
     slibGuile = slibGuile.override { scheme = guile_1_8; };
-    goffice = goffice_0_8;
+    goffice = gnome3.goffice_0_8;
   };
 
-  goffice_0_8 = callPackage ../desktops/gnome-3/3.12/misc/goffice/0.8.nix {
-    inherit (gnome2) libglade libgnomeui;
-    gconf = gnome2.GConf;
-    libart = gnome2.libart_lgpl;
-  }; # latest version: gnome3.goffice
-
   idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; });
 
   libquvi = callPackage ../applications/video/quvi/library.nix { };