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

Fix evaluation of goffice 0.8 across gnome updates

Browse Source
This commit is contained in:
Luca Bruno 2015-05-18 13:05:26 +02:00
parent d511369fcc
commit 99b14de505
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
};

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

@ -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 { };