yelp-tools: move to top-level

This commit is contained in:
Jan Tojnar 2019-11-20 04:30:05 +01:00
parent 6bddcf4645
commit 5b11829a63
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
8 changed files with 17 additions and 12 deletions

View file

@ -27,6 +27,7 @@
, qt4
, withQt5 ? false
, qtbase
, yelp-tools
}:
with stdenv.lib;
@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoconf
automake
gnome3.yelp-tools
yelp-tools
gnome3.yelp-xsl
gobject-introspection
gtk-doc

View file

@ -1,5 +1,5 @@
{ avahiSupport ? false # build support for Avahi in libinfinity
, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook
, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook, yelp-tools
, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }:
let
@ -13,7 +13,7 @@ in stdenv.mkDerivation {
sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az";
};
nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool gnome3.yelp-tools wrapGAppsHook ];
nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool yelp-tools wrapGAppsHook ];
buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ];
preConfigure = "./autogen.sh";

View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, barcode, gnome3, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
, intltool, itstool, makeWrapper, pkgconfig
, intltool, itstool, makeWrapper, pkgconfig, yelp-tools
}:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
buildInputs = [
barcode gtk3 gtk-doc gnome3.yelp-tools
barcode gtk3 gtk-doc yelp-tools
gnome3.gnome-common gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool
];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch,
pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg,
pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, yelp-tools,
vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection
}:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
itstool
desktop-file-utils
vala
gnome3.yelp-tools
yelp-tools
wrapGAppsHook
# For https://github.com/FontManager/master/blob/master/lib/unicode/meson.build
gobject-introspection

View file

@ -30,6 +30,7 @@
, postgresql
, gnome3
, gobject-introspection
, yelp-tools
, wrapGAppsHook
}:
@ -67,7 +68,7 @@ in stdenv.mkDerivation rec {
libtool
mm-common
intltool
gnome3.yelp-tools
yelp-tools
itstool
doxygen
graphviz

View file

@ -160,8 +160,6 @@ lib.makeScope pkgs.newScope (self: with self; {
yelp-xsl = callPackage ./core/yelp-xsl { };
yelp-tools = callPackage ./core/yelp-tools { };
zenity = callPackage ./core/zenity { };
@ -360,4 +358,6 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) gegl_0_4; # added 2019-10-31
inherit (pkgs) gjs; # added 2019-01-05
inherit (pkgs) yelp-tools; # added 2019-11-20
})

View file

@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
};
passthru = {
updateScript = gnome3.updateScript { packageName = "yelp-tools"; attrPath = "gnome3.yelp-tools"; };
updateScript = gnome3.updateScript {
packageName = pname;
};
};
nativeBuildInputs = [ pkgconfig ];

View file

@ -20439,7 +20439,6 @@ in
orca = python3Packages.callPackage ../applications/misc/orca {
inherit (pkgs) pkgconfig;
inherit (gnome3) yelp-tools;
};
osm2xmap = callPackage ../applications/misc/osm2xmap {
@ -22259,6 +22258,8 @@ in
inherit (gnome3) yelp;
yelp-tools = callPackage ../development/misc/yelp-tools { };
yokadi = python3Packages.callPackage ../applications/misc/yokadi {};
yoshimi = callPackage ../applications/audio/yoshimi { };