diff options
| -rw-r--r-- | doc/multiple-output.xml | 2 | ||||
| -rw-r--r-- | pkgs/build-support/setup-hooks/multiple-outputs.sh | 1 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/bindings/libglademm/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/vala/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libxmlxx/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libxmlxx/v3.nix | 2 |
6 files changed, 11 insertions, 2 deletions
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index a2acc91e55a2..2f23da8df01e 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -68,7 +68,7 @@ <varlistentry><term><varname> $outputDevdoc</varname></term><listitem><para> - is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. + is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. </para></listitem></varlistentry> <varlistentry><term><varname> diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index ac2368a5b219..d43b18776742 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -140,6 +140,7 @@ _multioutDocs() { moveToOutput share/info "${!outputInfo}" moveToOutput share/doc "${!outputDoc}" moveToOutput share/gtk-doc "${!outputDevdoc}" + moveToOutput share/devhelp/books "${!outputDevdoc}" # the default outputMan is in $bin moveToOutput share/man "${!outputMan}" diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix index 8cf18b7018da..d4813eb2a938 100644 --- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix +++ b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix @@ -7,7 +7,9 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2"; sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q"; }; - + + outputs = [ "out" "devdoc" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool ]; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index baf48d7a532c..1679407f39c2 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -12,6 +12,8 @@ let inherit sha256; }; + outputs = [ "out" "devdoc" ]; + nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs; buildInputs = [ glib libiconv ] ++ libintlOrEmpty ++ extraBuildInputs; diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 23b36db8fe10..226fe5be536a 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a"; }; + outputs = [ "out" "devdoc" ]; + nativeBuildInputs = [ pkgconfig perl ]; propagatedBuildInputs = [ libxml2 glibmm ]; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index 646fdfbac4f3..5e1e947b8f7c 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r"; }; + outputs = [ "out" "devdoc" ]; + nativeBuildInputs = [ pkgconfig perl ]; buildInputs = [ glibmm ]; |