public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

goffice: separate from gnome3

Browse Source 
It's got practically no coupling with gnome, except for gtk3.
This commit is contained in:
Vladimír Čunát 2015-06-11 20:50:43 +02:00
parent 03e4e3e92a
commit 39902b01bf
6 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/office/gnumeric/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser
, gnome3, makeWrapper, gtk3 , goffice, gnome3, makeWrapper, gtk3
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# ToDo: optional libgda, python, introspection? # ToDo: optional libgda, python, introspection?
buildInputs = [ buildInputs = [
pkgconfig intltool perl perlXMLParser pkgconfig intltool perl perlXMLParser
gnome3.goffice gtk3 makeWrapper gnome3.defaultIconTheme goffice gtk3 makeWrapper gnome3.defaultIconTheme
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

8
pkgs/desktops/gnome-3/3.16/default.nix
View File

@ -273,14 +273,6 @@ rec {
gfbgraph = callPackage ./misc/gfbgraph { }; 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 { gitg = callPackage ./misc/gitg {
webkitgtk = webkitgtk24x; webkitgtk = webkitgtk24x;
}; };

4
pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix → pkgs/development/libraries/goffice/0.8.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 { fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
, pango, libgsf, libxml2, libart, intltool, gettext , pango, libgsf, libxml2, libart, intltool, gettext
, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }: , cairo, gconf, libgnomeui, pcre, goffice/*just meta*/ }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "goffice-0.8.17"; name = "goffice-0.8.17";
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
meta = gnome3.goffice.meta // { meta = goffice.meta // {
maintainers = [ ]; maintainers = [ ];
}; };
} }

0
pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix → pkgs/development/libraries/goffice/default.nix
View File

0
pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch → pkgs/development/libraries/goffice/pcre_info.patch
View File

8
pkgs/top-level/all-packages.nix
View File

@ -11260,7 +11260,13 @@ let
goffice = goffice_0_8; 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; }); idea = recurseIntoAttrs (callPackage ../applications/editors/idea { androidsdk = androidsdk_4_4; });