diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-03-25 17:26:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-25 17:26:26 +0000 |
| commit | 2308f4ebf04bd9bdcd702f0eb87f3f6bd8fd6348 (patch) | |
| tree | d1ef930c0db6bcb938eae5f5403db6f1417551f1 /pkgs/desktops | |
| parent | 362fbc514a92178008d43ad4281d40f32ad2a013 (diff) | |
| parent | 4b625fd25ae90f8b23c418d0ca8948273a6f16f7 (diff) | |
| download | nixlib-2308f4ebf04bd9bdcd702f0eb87f3f6bd8fd6348.tar nixlib-2308f4ebf04bd9bdcd702f0eb87f3f6bd8fd6348.tar.gz nixlib-2308f4ebf04bd9bdcd702f0eb87f3f6bd8fd6348.tar.bz2 nixlib-2308f4ebf04bd9bdcd702f0eb87f3f6bd8fd6348.tar.lz nixlib-2308f4ebf04bd9bdcd702f0eb87f3f6bd8fd6348.tar.xz nixlib-2308f4ebf04bd9bdcd702f0eb87f3f6bd8fd6348.tar.zst nixlib-2308f4ebf04bd9bdcd702f0eb87f3f6bd8fd6348.zip | |
Merge pull request #37005 from coreyoconnor/zenity-docbook-dtd
gnome2.zenity: Add docbook_xml_dtd_412 to prevent build failure
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/desktop/zenity/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index 7202be839082..276bc7e79c1a 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -3,7 +3,7 @@ , glib, gtk, pango, atk, gnome-doc-utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd , librsvg, gnome_menus, gnome-desktop, gnome_panel, metacity, gnome-settings-daemon , libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2 -, libSM }: +, libSM, docbook_xml_dtd_412 }: stdenv.mkDerivation { name = "gnome-control-center-2.32.1"; @@ -15,9 +15,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; 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 - libSM + libSM docbook_xml_dtd_412 ]; configureFlags = "--disable-scrollkeeper"; } diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix index 55a5f9c0a234..014255785ddf 100644 --- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix +++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix @@ -1,5 +1,5 @@ { 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 { name = "zenity-2.32.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; 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 ]; } |