From 39902b01bfb583621d4844f23a1ff7d069a7d763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Jun 2015 20:50:43 +0200
Subject: [PATCH] goffice: separate from gnome3

It's got practically no coupling with gnome, except for gtk3.
---
 pkgs/applications/office/gnumeric/default.nix             | 4 ++--
 pkgs/desktops/gnome-3/3.16/default.nix                    | 8 --------
 .../3.16/misc => development/libraries}/goffice/0.8.nix   | 4 ++--
 .../misc => development/libraries}/goffice/default.nix    | 0
 .../libraries}/goffice/pcre_info.patch                    | 0
 pkgs/top-level/all-packages.nix                           | 8 +++++++-
 6 files changed, 11 insertions(+), 13 deletions(-)
 rename pkgs/{desktops/gnome-3/3.16/misc => development/libraries}/goffice/0.8.nix (91%)
 rename pkgs/{desktops/gnome-3/3.16/misc => development/libraries}/goffice/default.nix (100%)
 rename pkgs/{desktops/gnome-3/3.16/misc => development/libraries}/goffice/pcre_info.patch (100%)

diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 02a78a2b2d1..e54dd591cfd 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
-, gnome3, makeWrapper, gtk3
+, goffice, gnome3, makeWrapper, gtk3
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # ToDo: optional libgda, python, introspection?
   buildInputs = [
     pkgconfig intltool perl perlXMLParser
-    gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme
+    goffice gtk3 makeWrapper gnome3.defaultIconTheme
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index 15f4a210e04..be60a58db26 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -273,14 +273,6 @@ rec {
 
   gfbgraph = callPackage ./misc/gfbgraph { };
 
-  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/desktops/gnome-3/3.16/misc/goffice/0.8.nix b/pkgs/development/libraries/goffice/0.8.nix
similarity index 91%
rename from pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix
rename to pkgs/development/libraries/goffice/0.8.nix
index 02520a9f121..75a7dfb4898 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix
+++ b/pkgs/development/libraries/goffice/0.8.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
 , pango, libgsf, libxml2, libart, intltool, gettext
-, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }:
+, cairo, gconf, libgnomeui, pcre, goffice/*just meta*/ }:
 
 stdenv.mkDerivation rec {
   name = "goffice-0.8.17";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = gnome3.goffice.meta // {
+  meta = goffice.meta // {
     maintainers = [ ];
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix
rename to pkgs/development/libraries/goffice/default.nix
diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch b/pkgs/development/libraries/goffice/pcre_info.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch
rename to pkgs/development/libraries/goffice/pcre_info.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 991928ae5db..bff25e186c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11260,7 +11260,13 @@ let
     goffice = goffice_0_8;
   };
 
-  goffice_0_8 = gnome3.goffice_0_8;
+  goffice = callPackage ../development/libraries/goffice { };
+
+  goffice_0_8 = callPackage ../development/libraries/goffice/0.8.nix {
+    inherit (pkgs.gnome2) libglade libgnomeui;
+    gconf = pkgs.gnome2.GConf;
+    libart = pkgs.gnome2.libart_lgpl;
+  };
 
   idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; });