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

Merge pull request #57110 from volth/gtkdoc 

gnome2.gtkdoc -> gtk-doc
This commit is contained in:
Vladyslav M 2019-03-10 11:31:41 +02:00 committed by GitHub
parent f982aa04ac 84aed5da35
commit ad2cbb8029
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2, { stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2, gtkmm2,
libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors libgtop, libxfce4ui, libxfce4util, xfce4-panel, lm_sensors
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gnome2.gtkmm2 gtkmm2
gnome2.libgnomecanvas gnome2.libgnomecanvas
gnome2.libgnomecanvasmm gnome2.libgnomecanvasmm
libgtop libgtop

4
pkgs/development/libraries/gdome2/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, glib, libxml2, gtkdoc}: {stdenv, fetchurl, pkgconfig, glib, libxml2, gtk-doc}:
let let
pname = "gdome2"; pname = "gdome2";
@ -16,7 +16,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libxml2 gtkdoc]; buildInputs = [ glib libxml2 gtk-doc ];
propagatedBuildInputs = [glib libxml2]; propagatedBuildInputs = [glib libxml2];
patches = [ ./xml-document.patch ]; patches = [ ./xml-document.patch ];

4
pkgs/development/libraries/liblangtag/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtkdoc, gettext {stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext
, pkgconfig, glib, libxml2, gobject-introspection, gnome-common, unzip , pkgconfig, glib, libxml2, gobject-introspection, gnome-common, unzip
}: }:
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common
unzip ]; unzip ];
nativeBuildInputs = [ autoreconfHook gtkdoc gettext pkgconfig ]; nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkgconfig ];
meta = { meta = {
inherit version; inherit version;

6
pkgs/development/libraries/libunique/3.x.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, dbus, dbus-glib, gtk3, gobject-introspection , dbus, dbus-glib, gtk3, gobject-introspection
, gtkdoc, docbook_xml_dtd_45, docbook_xsl , gtk-doc, docbook_xml_dtd_45, docbook_xsl
, libxslt, libxml2 }: , libxslt, libxml2 }:
with stdenv.lib; with stdenv.lib;
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
minorVer = "2"; minorVer = "2";
version = "${majorVer}.${minorVer}"; version = "${majorVer}.${minorVer}";
name = "libunique3-${version}"; name = "libunique3-${version}";
srcName = "libunique-${version}"; srcName = "libunique-${version}";
src = fetchurl { src = fetchurl {
url = "http://ftp.gnome.org/pub/GNOME/sources/libunique/${majorVer}/${srcName}.tar.xz"; url = "http://ftp.gnome.org/pub/GNOME/sources/libunique/${majorVer}/${srcName}.tar.xz";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];
meta = { meta = {
homepage = https://wiki.gnome.org/Attic/LibUnique; homepage = https://wiki.gnome.org/Attic/LibUnique;

4
pkgs/development/tools/misc/intel-gpu-tools/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev
, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
, procps, utilmacros, gnome2, openssl, peg }: , procps, utilmacros, gtk-doc, openssl, peg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "intel-gpu-tools-${version}"; name = "intel-gpu-tools-${version}";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig utilmacros ]; nativeBuildInputs = [ pkgconfig utilmacros ];
buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod
libXext libXv libXrandr glib bison libunwind python3 procps libXext libXv libXrandr glib bison libunwind python3 procps
gnome2.gtkdoc openssl peg ]; gtk-doc openssl peg ];
preConfigure = '' preConfigure = ''
./autogen.sh ./autogen.sh

4
pkgs/tools/security/oath-toolkit/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitLab, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtkdoc, perl, gengetopt, bison, help2man }: { stdenv, fetchFromGitLab, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtk-doc, perl, gengetopt, bison, help2man }:
let let
securityDependency = securityDependency =
@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ securityDependency libxml2 perl gengetopt bison ]; buildInputs = [ securityDependency libxml2 perl gengetopt bison ];
nativeBuildInputs = [ autoreconfHook gtkdoc help2man pkgconfig ]; nativeBuildInputs = [ autoreconfHook gtk-doc help2man pkgconfig ];
# man file generation fails when true # man file generation fails when true
enableParallelBuilding = false; enableParallelBuilding = false;

9
pkgs/top-level/all-packages.nix
View File

@ -3991,7 +3991,6 @@ in
libite = callPackage ../development/libraries/libite { }; libite = callPackage ../development/libraries/libite { };
liblangtag = callPackage ../development/libraries/liblangtag { liblangtag = callPackage ../development/libraries/liblangtag {
inherit (gnome2) gtkdoc;
inherit (gnome3) gnome-common; inherit (gnome3) gnome-common;
}; };
@ -4581,7 +4580,7 @@ in
nzbget = callPackage ../tools/networking/nzbget { }; nzbget = callPackage ../tools/networking/nzbget { };
oathToolkit = callPackage ../tools/security/oath-toolkit { inherit (gnome2) gtkdoc; }; oathToolkit = callPackage ../tools/security/oath-toolkit { };
obex_data_server = callPackage ../tools/bluetooth/obex-data-server { }; obex_data_server = callPackage ../tools/bluetooth/obex-data-server { };
@ -9927,9 +9926,7 @@ in
gdl = callPackage ../development/libraries/gdl { }; gdl = callPackage ../development/libraries/gdl { };
gdome2 = callPackage ../development/libraries/gdome2 { gdome2 = callPackage ../development/libraries/gdome2 { };
inherit (gnome2) gtkdoc;
};
gdbm = callPackage ../development/libraries/gdbm { }; gdbm = callPackage ../development/libraries/gdbm { };
@ -11480,7 +11477,7 @@ in
libunibreak = callPackage ../development/libraries/libunibreak { }; libunibreak = callPackage ../development/libraries/libunibreak { };
libunique = callPackage ../development/libraries/libunique { }; libunique = callPackage ../development/libraries/libunique { };
libunique3 = callPackage ../development/libraries/libunique/3.x.nix { inherit (gnome2) gtkdoc; }; libunique3 = callPackage ../development/libraries/libunique/3.x.nix { };
liburcu = callPackage ../development/libraries/liburcu { }; liburcu = callPackage ../development/libraries/liburcu { };