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

Merge pull request #31284 from jtojnar/glade-fix 

glade: fix
This commit is contained in:
Orivej Desh 2017-11-05 18:01:27 +00:00 committed by GitHub
parent 2dfa36233d 6ad65e046f
commit f3bb86659b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/desktops/gnome-3/apps/glade/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, intltool, fetchurl, python { stdenv, intltool, fetchurl, python, autoreconfHook
, pkgconfig, gtk3, glib , pkgconfig, gtk3, glib
, makeWrapper, itstool, libxml2, docbook_xsl , makeWrapper, itstool, libxml2, docbook_xsl
, gnome3, librsvg, gdk_pixbuf, libxslt }: , gnome3, librsvg, gdk_pixbuf, libxslt }:
@ -8,13 +8,25 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [
buildInputs = [ gtk3 glib intltool itstool libxml2 python pkgconfig intltool itstool makeWrapper docbook_xsl libxslt
gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl # reconfiguration
gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ]; autoreconfHook gnome3.gnome_common gnome3.yelp_tools
];
buildInputs = [ gtk3 glib libxml2 python
gnome3.gsettings_desktop_schemas
gdk_pixbuf gnome3.defaultIconTheme librsvg ];
enableParallelBuilding = true; enableParallelBuilding = true;
patches = [
# https://bugzilla.gnome.org/show_bug.cgi?id=782161
(fetchurl {
url = https://bugzilla.gnome.org/attachment.cgi?id=351054;
sha256 = "093wjjj40027pkqqnm14jb2dp2i2m8p1bayqx1lw18pq66c8fahn";
})
];
preFixup = '' preFixup = ''
wrapProgram "$out/bin/glade" \ wrapProgram "$out/bin/glade" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \