diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-04 18:59:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-04 18:59:55 +0100 |
commit | 57d33a2c8f151d0a09e45053c5ad77a2cb15f0cc (patch) | |
tree | 7874914e21d43377651d526dd22619801e1b5ec0 /pkgs | |
parent | 5842a29159bf2b8287993706f17b3c424b47be0c (diff) | |
parent | 6160907f85f2e014e885599b0e19d5f302577783 (diff) | |
download | nixpkgs-57d33a2c8f151d0a09e45053c5ad77a2cb15f0cc.tar nixpkgs-57d33a2c8f151d0a09e45053c5ad77a2cb15f0cc.tar.gz nixpkgs-57d33a2c8f151d0a09e45053c5ad77a2cb15f0cc.tar.bz2 nixpkgs-57d33a2c8f151d0a09e45053c5ad77a2cb15f0cc.tar.lz nixpkgs-57d33a2c8f151d0a09e45053c5ad77a2cb15f0cc.tar.xz nixpkgs-57d33a2c8f151d0a09e45053c5ad77a2cb15f0cc.tar.zst nixpkgs-57d33a2c8f151d0a09e45053c5ad77a2cb15f0cc.zip |
Merge pull request #72788 from jtojnar/devhelp-blank
gnome3.devhelp: fix blank pages
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/gnome-3/devtools/devhelp/default.nix | 55 |
1 files changed, 47 insertions, 8 deletions
diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 8d731d829b2..080a332d7df 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -1,6 +1,22 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gtk3, wrapGAppsHook -, glib, amtk, appstream-glib, gobject-introspection, python3 -, webkitgtk, gettext, itstool, gsettings-desktop-schemas }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gnome3 +, gtk3 +, wrapGAppsHook +, glib +, amtk +, appstream-glib +, gobject-introspection +, python3 +, webkitgtk +, gettext +, itstool +, gsettings-desktop-schemas +, shared-mime-info +}: stdenv.mkDerivation rec { pname = "devhelp"; @@ -11,10 +27,25 @@ stdenv.mkDerivation rec { sha256 = "0zpmn6fgkgiayvn4diia5df0s6s7dqrdnp3nrvpavsmgn0vhb4pg"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook appstream-glib gobject-introspection python3 ]; + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + itstool + wrapGAppsHook + appstream-glib + gobject-introspection + python3 + ]; + buildInputs = [ - glib gtk3 webkitgtk amtk - gnome3.adwaita-icon-theme gsettings-desktop-schemas + glib + gtk3 + webkitgtk + amtk + gnome3.adwaita-icon-theme + gsettings-desktop-schemas ]; doCheck = true; @@ -24,6 +55,14 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; + preFixup = '' + gappsWrapperArgs+=( + # Fix pages being blank + # https://gitlab.gnome.org/GNOME/devhelp/issues/14 + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ) + ''; + passthru = { updateScript = gnome3.updateScript { packageName = "devhelp"; @@ -33,8 +72,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "API documentation browser for GNOME"; - homepage = https://wiki.gnome.org/Apps/Devhelp; - license = licenses.gpl2; + homepage = "https://wiki.gnome.org/Apps/Devhelp"; + license = licenses.gpl3Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; }; |