diff options
33 files changed, 37 insertions, 44 deletions
diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix index c8fe6f063fd..4d3f0910543 100644 --- a/pkgs/desktops/xfce/core/exo.nix +++ b/pkgs/desktops/xfce/core/exo.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; name = "${p_name}-${ver_maj}.${ver_min}"; - outputs = [ "dev" "out" "doc" ]; # dev-doc only + outputs = [ "dev" "out" "docdev" ]; # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/ nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix index 3b57a2bb767..4fffc9e1ec9 100644 --- a/pkgs/desktops/xfce/core/garcon.nix +++ b/pkgs/desktops/xfce/core/garcon.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "dev" "out" ]; buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ]; diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix index 807842218aa..87a7ada9e48 100644 --- a/pkgs/desktops/xfce/core/libxfce4ui.nix +++ b/pkgs/desktops/xfce/core/libxfce4ui.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43"; }; - outputs = [ "dev" "out" "doc" ]; # dev-doc only + outputs = [ "dev" "out" "docdev" ]; buildInputs = [ pkgconfig intltool gtk libxfce4util xfconf libglade diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix index 2f5b7f880f2..cab904f5510 100644 --- a/pkgs/desktops/xfce/core/libxfce4util.nix +++ b/pkgs/desktops/xfce/core/libxfce4util.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7"; }; - outputs = [ "dev" "out" "doc" ]; # just dev-doc + outputs = [ "dev" "out" "docdev" ]; buildInputs = [ pkgconfig glib intltool ]; diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix index 86c3bea176b..d9e5cce25e8 100644 --- a/pkgs/desktops/xfce/core/libxfcegui4.nix +++ b/pkgs/desktops/xfce/core/libxfcegui4.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib"; }; - outputs = [ "dev" "out" "doc" ]; # dev-doc only + outputs = [ "dev" "out" "docdev" ]; #TODO: gladeui # By default, libxfcegui4 tries to install into libglade's prefix. diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix index a09dfaa7a54..132003d3fc9 100644 --- a/pkgs/desktops/xfce/core/tumbler.nix +++ b/pkgs/desktops/xfce/core/tumbler.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh"; }; - outputs = [ "dev" "out" "doc" ]; # dev-doc only + outputs = [ "dev" "out" "docdev" ]; buildInputs = [ pkgconfig intltool dbus_glib gdk_pixbuf curl freetype diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index 5a46af4ce17..eb3c0fb8334 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = [ ./xfce4-panel-datadir.patch ]; patchFlags = "-p1"; - outputs = [ "dev" "out" "doc" ]; # just dev-doc + outputs = [ "dev" "out" "docdev" ]; buildInputs = [ pkgconfig intltool gtk libxfce4util exo libwnck diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index f17027f9884..13902fa4428 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r"; }; - outputs = [ "dev" "out" "doc" ]; # TODO: dev-doc only + outputs = [ "dev" "out" "docdev" ]; #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib) buildInputs = [ pkgconfig intltool glib libxfce4util ]; diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 763b161aa9e..22fb400a1ea 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1ryz1gfgrxcj806cakcblxf0bcwq8p2mw8k86fs3f5wlwayawzkn"; }; - outputs = [ "dev" "out" "doc" ]; + outputs = [ "dev" "out" ]; outputBin = "dev"; # compilation tools postInstall = '' 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 ]; diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index d657a6ccc98..9ee8be87c02 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -28,12 +28,6 @@ preConfigure() { perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags } -preFixup() { - if [ -n "$man" ]; then - mkdir -p $man/share - if [ -d $out/man ]; then mv $out/man $man/share/; fi - fi -} postFixup() { # If a user installs a Perl package, she probably also wants its diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index bf41f4d3945..91a004a7f68 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -4,7 +4,7 @@ perl: perl.stdenv.mkDerivation ( { - outputs = [ "out" "man" ]; + outputs = [ "out" "docdev" ]; doCheck = true; diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix index 6f713933040..897210a4046 100644 --- a/pkgs/development/python-modules/pygobject/default.nix +++ b/pkgs/development/python-modules/pygobject/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv"; }; - outputs = [ "out" "doc" ]; + outputs = [ "out" "docdev" ]; configureFlags = "--disable-introspection"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 9f84009a55f..c4f386b18d4 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -128,7 +128,7 @@ in ''; propagatedBuildInputs = [ xorg.libSM ]; CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -"; - outputs = [ "dev" "out" "doc" ]; # "dev-doc" only (incl. man pages) + outputs = [ "dev" "out" "docdev" ]; }; # See https://bugs.freedesktop.org/show_bug.cgi?id=47792 @@ -151,7 +151,7 @@ in }; libXaw = attrs: attrs // { - outputs = [ "dev" "out" "doc" ]; # just dev-doc + outputs = [ "dev" "out" "docdev" ]; propagatedBuildInputs = [ xorg.libXmu ]; }; @@ -213,11 +213,11 @@ in }; libXres = attrs: attrs // { - outputs = [ "dev" "out" "doc" ]; # just dev-doc + outputs = [ "dev" "out" "docdev" ]; }; libXv = attrs: attrs // { - outputs = [ "dev" "out" "doc" ]; # just dev-doc + outputs = [ "dev" "out" "docdev" ]; }; libXvMC = attrs: attrs // { diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 5a134e572ae..288b2d0863d 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "050q6i20lbh7dyyhva2sbp8dbyp6sghlkbpvq2bvcasqwsx4298y"; }; - outputs = [ "dev" "out" "bin" "doc" ]; # man3 is "dev-doc" + outputs = [ "dev" "out" "bin" "man" "docdev" ]; nativeBuildInputs = [ pkgconfig ]; # Zlib and OpenSSL must be propagated because `libcurl.la' contains |