diff options
Diffstat (limited to 'pkgs/development/libraries')
19 files changed, 21 insertions, 22 deletions
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 0a1e1a3e89a..0d0ed70bc1e 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn"; }; - outputs = [ "dev" "out" "man" ]; + outputs = [ "dev" "out" ]; outputBin = "dev"; # sdl-config nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 256865aefb9..a4707ef4334 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0xna0gnlqvzy6209klirywcm7ianazshg6pkk828g07bnrywgvhs"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "dev" "out" ]; buildInputs = [ python pkgconfig popt intltool dbus_glib diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index fbfb5765996..14e2e71c0bd 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "dev" "out" ]; buildInputs = libintlOrEmpty; diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 1d91faa6817..59d227f0e86 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz"; }; - outputs = [ "dev" "out" "doc" ]; # "dev-doc" only + outputs = [ "dev" "out" "docdev" ]; outputBin = "dev"; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix index 93bad0059b7..ee81aec0797 100644 --- a/pkgs/development/libraries/gmime/default.nix +++ b/pkgs/development/libraries/gmime/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "dev" "out" ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib zlib libgpgerror ]; diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index c04a1e0b4cc..daa2cb1efb4 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0mj6xn40py9r9lvzg633fal81xfwfm89d9mvz7jk4lmwk0g49imj"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "dev" "out" "docdev" ]; outputBin = "dev"; enableParallelBuilding = true; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { else "--with-xinput=yes"; postInstall = '' - _moveToOutput share/gtk-2.0/demo "$doc" + _moveToOutput share/gtk-2.0/demo "$docdev" ''; passthru = { diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 6ee88f6ea4f..789a584d1ef 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "1xrxlrvgyr6mm9qjxmkif2kvcah082y94gf1vqi0f0bdl1g8gp7b"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "dev" "out" ]; outputBin = "dev"; configureFlags = [ diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 625da63084c..19e8f38b373 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -8,12 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1xf4hphhahcjm2xwx147lfpsavjwv9l4c2gf6hx71zxywbz5lpds"; }; - outputs = [ "dev" "out" "bin" "info" "doc" ]; # $doc has just man3 + outputs = [ "dev" "out" "bin" "info" "docdev" ]; doCheck = ! stdenv.isDarwin; - postFixup = ''_moveToOutput share/man/man1 "$bin" ''; - meta = { homepage = http://www.gnu.org/software/libidn/; description = "Library for internationalized domain names"; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 0a056518adb..f6cd283d424 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17q6v5q0jpg57vylby6rx1qkil72bdx8gij1g9m694gxf5sb6js1"; }; - outputs = [ "dev" "out" "doc" ]; # dev-doc only, I think + outputs = [ "dev" "out" "docdev" ]; buildInputs = [ libgcrypt ]; diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index 597d96e187c..754e308ac15 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./x86_64-cpuid.patch ]; - outputs = [ "dev" "out" "doc" ]; # just dev-doc + outputs = [ "dev" "out" "docdev" ]; outputBin = "dev"; # oil-bugreport nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 47cc353bbd9..82768cd350d 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8"; }; - outputs = [ "dev" "out" "doc" ]; # dev-doc only + outputs = [ "dev" "out" "docdev" ]; preBuild = '' patchShebangs . diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 4d66654c9a8..884109ea6db 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "05c2is69c50lyikkh29nk6zhghjk4i7hjx0zqfhq47aald1jj82s"; }; - outputs = [ "dev" "out" "doc" ]; # it's dev-doc only + outputs = [ "dev" "out" "docdev" ]; buildInputs = [ openssl zlib ]; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index a7007da3a01..5ac8cc94d04 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1j8iixynchziw1y39lnibyl5h81m4p78w3i4f28q2vgwjgf801x4"; }; - outputs = [ "dev" "out" "doc" ]; # it's dev-doc only, lots of it + outputs = [ "dev" "out" "docdev" ]; outputBin = "dev"; buildInputs = [ perl texinfo ]; diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 2f2a85d670e..129dface2d9 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0"; }; - outputs = [ "dev" "out" "doc" ]; # dev-doc only + outputs = [ "dev" "out" "docdev" ]; + outputDoc = "docdev"; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libogg libvorbis ]; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 59445f0e89f..f074b31bb68 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b"; }; - outputs = [ "dev" "out" "doc" ]; # dev-doc only + outputs = [ "dev" "out" "docdev" ]; # TODO: enable xmodmap support, needs xmodmap DB propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index e3bb518cf20..f2a9bdc1230 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1i3a1wdpagm0p3y1bwaz5x5rjhcpqbcrnhkcp10p259vkxk72wz5"; }; - outputs = [ "dev" "out" "doc" ]; # only dev-doc + outputs = [ "dev" "out" "docdev" ]; outputBin = "dev"; buildInputs = [ pkgconfig libffi libtasn1 libiconv ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index cfa5aadd0f9..e213fa56a7c 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0v12gi7f01iq3z852pclpnmkbcksbvpcmiazmklkx1dd9fbpakhx"; }; - outputs = [ "dev" "out" "bin" "doc" ]; + outputs = [ "dev" "out" "bin" "docdev" ]; buildInputs = [ gobjectIntrospection ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 92777f00169..ebcdcc2b3ef 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - outputs = [ "out" ] ++ lib.optional (!minimal) "doc"; + outputs = [ "dev" "out" ]; patches = [ ./datadir_env.patch ]; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index f47ce4e2e46..2df7d051894 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; - outputs = [ "dev" "out" "doc" ]; # dev-doc only + outputs = [ "dev" "out" "docdev" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ orc ]; |