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

Merge pull request #31987 from jtojnar/devhelp-devdoc

Browse Source 
stdenv: Move devhelp books to outputDevdoc
This commit is contained in:
Orivej Desh 2017-11-25 23:14:47 +00:00 committed by GitHub
commit 29b2984b0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/multiple-output.xml
View File

@ -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>

1
pkgs/build-support/setup-hooks/multiple-outputs.sh
View File

@ -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}"

4
pkgs/desktops/gnome-2/bindings/libglademm/default.nix
View File

@ -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 ];

2
pkgs/development/compilers/vala/default.nix
View File

@ -12,6 +12,8 @@ let
inherit sha256;
};
outputs = [ "out" "devdoc" ];
nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs;
buildInputs = [ glib libiconv ] ++ libintlOrEmpty ++ extraBuildInputs;

2
pkgs/development/libraries/libxmlxx/default.nix
View File

@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a";
};
outputs = [ "out" "devdoc" ];
nativeBuildInputs = [ pkgconfig perl ];
propagatedBuildInputs = [ libxml2 glibmm ];

2
pkgs/development/libraries/libxmlxx/v3.nix
View File

@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r";
};
outputs = [ "out" "devdoc" ];
nativeBuildInputs = [ pkgconfig perl ];
buildInputs = [ glibmm ];