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

gnome3.gnome_shell: Rely on XML_CATALOG_FILES variable

Browse Source
This commit is contained in:
Jan Tojnar 2017-10-07 15:07:47 +02:00
parent 85cac43f7f
commit e51c2a5d45
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/desktops/gnome-3/core/gnome-shell/default.nix
View File

@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
LANG = "en_US.UTF-8"; LANG = "en_US.UTF-8";
nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns perl wrapGAppsHook glibcLocales ]; nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ];
buildInputs = with gnome3; buildInputs = with gnome3;
[ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf
@ -44,16 +44,6 @@ in stdenv.mkDerivation rec {
./fix-paths.patch ./fix-paths.patch
]; ];
postPatch = ''
substituteInPlace man/meson.build --replace \
"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" \
"${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
substituteInPlace man/gnome-shell.xml --replace \
http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd \
${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd
'';
preBuild = '' preBuild = ''
# meson setup-hook changes the directory so the files are located one level up # meson setup-hook changes the directory so the files are located one level up
patchShebangs ../src/data-to-c.pl patchShebangs ../src/data-to-c.pl