From 923681d576009ca9a18a18d8494e778cb8e568ae Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 16 Feb 2014 11:25:25 +0100 Subject: [PATCH 1/2] yelp-xsl: new package Yelp's universal stylesheets for Mallard and DocBook. https://wiki.gnome.org/Apps/Yelp --- .../gnome-3/core/yelp-xsl/default.nix | 23 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix new file mode 100644 index 00000000000..708a8ff32d6 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -0,0 +1,23 @@ +{ stdenv, intltool, fetchurl, pkgconfig, bash +, itstool, libxml2, libxslt }: + +stdenv.mkDerivation rec { + name = "yelp-xsl-3.10.1"; + + src = fetchurl { + url = "https://download.gnome.org/sources/yelp-xsl/3.10/${name}.tar.xz"; + sha256 = "59c6dee3999121f6ffd33a9c5228316b75bc22e3bd68fff310beb4eeff245887"; + }; + + doCheck = true; + + buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ]; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Yelp; + description = "Yelp's universal stylesheets for Mallard and DocBook"; + maintainers = with maintainers; [ lethalman ]; + license = [licenses.gpl2 licenses.lgpl2]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 204a7600cf1..343f110aedc 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -84,6 +84,8 @@ rec { vte = callPackage ./core/vte { }; + yelp_xsl = callPackage ./core/yelp-xsl { }; + zenity = callPackage ./core/zenity { }; From da36d7d2207cda0413deeee9af0f42c071dc6d60 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 16 Feb 2014 11:42:22 +0100 Subject: [PATCH 2/2] yelp: new package Yelp is the help viewer in Gnome. https://wiki.gnome.org/Apps/Yelp --- pkgs/desktops/gnome-3/core/yelp/default.nix | 43 +++++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 + pkgs/top-level/all-packages.nix | 2 + 3 files changed, 47 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/yelp/default.nix diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix new file mode 100644 index 00000000000..b5f6600fb60 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -0,0 +1,43 @@ +{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib, file +, bash, makeWrapper, itstool, libxml2, libxslt, gnome3, icu }: + +# TODO: icons and theme still does not work +# use packaged gnome3.gnome_icon_theme_symbolic + +stdenv.mkDerivation rec { + name = "yelp-3.10.1"; + + src = fetchurl { + url = "https://download.gnome.org/sources/yelp/3.10/${name}.tar.xz"; + sha256 = "17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816"; + }; + + configureFlags = [ "--disable-static" ]; + + doCheck = true; + + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; + + buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool libxml2 libxslt icu file + gnome3.gsettings_desktop_schemas makeWrapper gnome3.yelp_xsl ]; + + installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/"; + + postInstall = '' + wrapProgram "$out/bin/yelp" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}" + ''; + + preFixup = '' + ''; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Yelp; + description = "Yelp is the help viewer in Gnome."; + maintainers = with maintainers; [ lethalman ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 343f110aedc..07e1a8bf841 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -84,6 +84,8 @@ rec { vte = callPackage ./core/vte { }; + yelp = callPackage ./core/yelp { }; + yelp_xsl = callPackage ./core/yelp-xsl { }; zenity = callPackage ./core/zenity { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f1728b599f..3be72edb240 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9235,6 +9235,8 @@ let yate = callPackage ../applications/misc/yate { }; + inherit (gnome3) yelp; + qgis = callPackage ../applications/misc/qgis {}; ykpers = callPackage ../applications/misc/ykpers {};