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

Merge pull request #54268 from hedning/gnome-fixes

Browse Source 
Gnome fixes (gnome-documents and eog)
This commit is contained in:
Tor Hedin Brønner 2019-01-18 14:55:14 +01:00 committed by GitHub
commit 4fe0bd0f29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, meson, ninja, gettext, fetchurl, evince, gjs { stdenv, meson, ninja, gettext, fetchurl, fetchpatch, evince, gjs
, pkgconfig, gtk3, glib, tracker, tracker-miners , pkgconfig, gtk3, glib, tracker, tracker-miners
, itstool, libxslt, webkitgtk, libgdata , itstool, libxslt, webkitgtk, libgdata
, gnome-desktop, libzapojit, libgepub , gnome-desktop, libzapojit, libgepub
@ -31,6 +31,14 @@ stdenv.mkDerivation rec {
gnome-desktop libzapojit libgepub gnome-desktop libzapojit libgepub
]; ];
patches = [
# fix RPATH to libgd
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/d18a92e0a940073ac766f609937539e4fc6cdbb7.patch";
sha256 = "0s3mk8vrl1gzk93yvgqbnz44i27qw1d9yvvmnck3fv23phrxkzk9";
})
];
postPatch = '' postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py patchShebangs meson_post_install.py

9
pkgs/desktops/gnome-3/core/eog/default.nix
View File

@ -25,6 +25,15 @@ in stdenv.mkDerivation rec {
patchShebangs meson_post_install.py patchShebangs meson_post_install.py
''; '';
preFixup = ''
gappsWrapperArgs+=(
# Thumbnailers
--prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
--prefix XDG_DATA_DIRS : "${librsvg}/share"
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
)
'';
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;