diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-13 19:32:51 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-13 19:32:51 +0200 |
commit | 34946256a08de90e23ef9da777634c843d2045e9 (patch) | |
tree | 6f4e759a3b5b661bc2affc95959cd716263ccaa2 /pkgs/servers | |
parent | 2d0f1c81649807e56e50a27c5632c833f4342842 (diff) | |
parent | 58834f727fab8c1c7d47c6f59b99ac42780b690a (diff) | |
download | nixlib-34946256a08de90e23ef9da777634c843d2045e9.tar nixlib-34946256a08de90e23ef9da777634c843d2045e9.tar.gz nixlib-34946256a08de90e23ef9da777634c843d2045e9.tar.bz2 nixlib-34946256a08de90e23ef9da777634c843d2045e9.tar.lz nixlib-34946256a08de90e23ef9da777634c843d2045e9.tar.xz nixlib-34946256a08de90e23ef9da777634c843d2045e9.tar.zst nixlib-34946256a08de90e23ef9da777634c843d2045e9.zip |
Merge #27424: stdenv: Don't put man pages into $doc
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/uftp/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 30f8fbef119d..3393d0cf58b6 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; # FIXME: -dev depends on -doc - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" "doc" ]; setOutputFlags = false; # it would move $out/modules, etc. buildInputs = [perl] ++ diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 22cc5646f8bf..2e32f75c8673 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -11,16 +11,16 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; - outputs = [ "out" "doc" ]; + outputs = [ "out" "man" ]; patchPhase = '' substituteInPlace makefile --replace gcc cc ''; installPhase = '' - mkdir -p $out/bin $doc/share/man/man1 + mkdir -p $out/bin $man/share/man/man1 cp {uftp,uftpd,uftp_keymgt,uftpproxyd} $out/bin/ - cp {uftp.1,uftpd.1,uftp_keymgt.1,uftpproxyd.1} $doc/share/man/man1 + cp {uftp.1,uftpd.1,uftp_keymgt.1,uftpproxyd.1} $man/share/man/man1 ''; meta = { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 8317bd7ce6fa..2f2270d536d2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -73,7 +73,7 @@ in libxcb = attrs : attrs // { nativeBuildInputs = [ args.python ]; configureFlags = "--enable-xkb --enable-xinput"; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" "doc" ]; }; xcbproto = attrs : attrs // { @@ -177,7 +177,7 @@ in }; libXext = attrs: attrs // { - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" "doc" ]; propagatedBuildInputs = [ xorg.xproto xorg.libXau ]; preConfigure = setMalloc0ReturnsNullCrossCompiling; }; @@ -187,7 +187,7 @@ in }; libXi = attrs: attrs // { - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" "man" "doc" ]; propagatedBuildInputs = [ xorg.libXfixes ]; }; |