summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-03-09 11:06:23 +0000
committervolth <volth@volth.com>2019-03-09 11:24:01 +0000
commit4e2c477cf83d88c3fd438d1fb369101b694142ab (patch)
tree316460c2b4c7a845feb40617b35f022030445793 /pkgs/development
parent9df6083b720b9a0c4e491b78efbda1d4a1c98194 (diff)
gnome2.gtkdoc -> gtk-doc
fix evaluation when `config.allowAliases` == false
(regression after https://github.com/NixOS/nixpkgs/pull/56791)
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/gdome2/default.nix4
-rw-r--r--pkgs/development/libraries/liblangtag/default.nix4
-rw-r--r--pkgs/development/libraries/libunique/3.x.nix6
-rw-r--r--pkgs/development/tools/misc/intel-gpu-tools/default.nix4
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix
index 306f228051bb6..e8982c4b70a42 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 6a9cab16e7ed7..24dd34d7a6a35 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 a072591ca9db9..b302e1d0ba032 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 3e0c1d55951ef..281b09393b5d0 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