From 4e2c477cf83d88c3fd438d1fb369101b694142ab Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 9 Mar 2019 11:06:23 +0000 Subject: [PATCH] gnome2.gtkdoc -> gtk-doc fix evaluation when `config.allowAliases` == false (regression after https://github.com/NixOS/nixpkgs/pull/56791) --- pkgs/development/libraries/gdome2/default.nix | 4 ++-- pkgs/development/libraries/liblangtag/default.nix | 4 ++-- pkgs/development/libraries/libunique/3.x.nix | 6 +++--- pkgs/development/tools/misc/intel-gpu-tools/default.nix | 4 ++-- pkgs/tools/security/oath-toolkit/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 9 +++------ 6 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix index 306f228051bb..e8982c4b70a4 100644 --- a/pkgs/development/libraries/gdome2/default.nix +++ b/pkgs/development/libraries/gdome2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, libxml2, gtkdoc}: +{stdenv, fetchurl, pkgconfig, glib, libxml2, gtk-doc}: let pname = "gdome2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libxml2 gtkdoc]; + buildInputs = [ glib libxml2 gtk-doc ]; propagatedBuildInputs = [glib libxml2]; patches = [ ./xml-document.patch ]; diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix index 6a9cab16e7ed..24dd34d7a6a3 100644 --- a/pkgs/development/libraries/liblangtag/default.nix +++ b/pkgs/development/libraries/liblangtag/default.nix @@ -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 }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common unzip ]; - nativeBuildInputs = [ autoreconfHook gtkdoc gettext pkgconfig ]; + nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkgconfig ]; meta = { inherit version; diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index a072591ca9db..b302e1d0ba03 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , dbus, dbus-glib, gtk3, gobject-introspection -, gtkdoc, docbook_xml_dtd_45, docbook_xsl +, gtk-doc, docbook_xml_dtd_45, docbook_xsl , libxslt, libxml2 }: with stdenv.lib; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { minorVer = "2"; version = "${majorVer}.${minorVer}"; name = "libunique3-${version}"; - srcName = "libunique-${version}"; + srcName = "libunique-${version}"; src = fetchurl { url = "http://ftp.gnome.org/pub/GNOME/sources/libunique/${majorVer}/${srcName}.tar.xz"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; 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 = { homepage = https://wiki.gnome.org/Attic/LibUnique; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 3e0c1d55951e..281b09393b5d 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod -, procps, utilmacros, gnome2, openssl, peg }: +, procps, utilmacros, gtk-doc, openssl, peg }: stdenv.mkDerivation rec { name = "intel-gpu-tools-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig utilmacros ]; buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod libXext libXv libXrandr glib bison libunwind python3 procps - gnome2.gtkdoc openssl peg ]; + gtk-doc openssl peg ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 03233917e2a3..9e154c19a9c0 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -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 securityDependency = @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { buildInputs = [ securityDependency libxml2 perl gengetopt bison ]; - nativeBuildInputs = [ autoreconfHook gtkdoc help2man pkgconfig ]; + nativeBuildInputs = [ autoreconfHook gtk-doc help2man pkgconfig ]; # man file generation fails when true enableParallelBuilding = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0a9c65f57ab..fc4dd846d338 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3989,7 +3989,6 @@ in libite = callPackage ../development/libraries/libite { }; liblangtag = callPackage ../development/libraries/liblangtag { - inherit (gnome2) gtkdoc; inherit (gnome3) gnome-common; }; @@ -4579,7 +4578,7 @@ in 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 { }; @@ -9925,9 +9924,7 @@ in gdl = callPackage ../development/libraries/gdl { }; - gdome2 = callPackage ../development/libraries/gdome2 { - inherit (gnome2) gtkdoc; - }; + gdome2 = callPackage ../development/libraries/gdome2 { }; gdbm = callPackage ../development/libraries/gdbm { }; @@ -11478,7 +11475,7 @@ in libunibreak = callPackage ../development/libraries/libunibreak { }; 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 { };