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

Merge pull request #37005 from coreyoconnor/zenity-docbook-dtd

Browse Source 
gnome2.zenity: Add docbook_xml_dtd_412 to prevent build failure
This commit is contained in:
Michael Raskin 2018-03-25 17:26:26 +00:00 committed by GitHub
commit 2308f4ebf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
View File

@ -3,7 +3,7 @@
, glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd , glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd
, librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon , librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon
, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2 , libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2
, libSM }: , libSM, docbook_xml_dtd_412 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gnome-control-center-2.32.1"; name = "gnome-control-center-2.32.1";
@ -15,9 +15,9 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils buildInputs = [ dbus-glib libxml2Python libxslt libxklavier popt which python shared-mime-info desktop-file-utils
gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2 gtk gnome-doc-utils intltool GConf libglade libgnomekbd libunique libtool bzip2
libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon libgnomeui librsvg gnome_menus gnome-desktop gnome_panel metacity gnome-settings-daemon
libSM libSM docbook_xml_dtd_412
]; ];
configureFlags = "--disable-scrollkeeper"; configureFlags = "--disable-scrollkeeper";
} }

4
pkgs/desktops/gnome-2/desktop/zenity/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk { stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, glib, gtk, pango, atk
, gnome-doc-utils, intltool, libglade, libX11, which }: , gnome-doc-utils, intltool, libglade, libX11, which, docbook_xml_dtd_412 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "zenity-2.32.1"; name = "zenity-2.32.1";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
}; };
configureFlags = "--disable-scrollkeeper"; configureFlags = "--disable-scrollkeeper";
buildInputs = [ gtk libglade libxml2 libxslt libX11 ]; buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ];
nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ]; nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ];
} }