diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-10-06 09:51:02 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-10-06 09:51:02 -0500 |
commit | 2e255a2edddfe5ca0e44f55d6e4bd82737cbb884 (patch) | |
tree | c785d80650dc2d074244525401246fc6ef07a468 /pkgs/data/documentation | |
parent | e3deccc0d7a42b0ae1d5e337cd6b0b9488c2295a (diff) | |
parent | 16dafb018e09363bfae3949a8261c18ee7880781 (diff) | |
download | nixpkgs-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar nixpkgs-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.gz nixpkgs-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.bz2 nixpkgs-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.lz nixpkgs-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.xz nixpkgs-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.tar.zst nixpkgs-2e255a2edddfe5ca0e44f55d6e4bd82737cbb884.zip |
Merge branch 'staging'
Diffstat (limited to 'pkgs/data/documentation')
-rw-r--r-- | pkgs/data/documentation/std-man-pages/default.nix | 2 | ||||
-rw-r--r-- | pkgs/data/documentation/stdman/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index ce38dd9c61a..04683ceddb3 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v"; }; - outputDocdev = "out"; + outputDevdoc = "out"; installPhase = '' mkdir -p $out/share/man diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index b7c713e5771..114c8ebce98 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "09c5gjhcz97ghfrv9zkgfb1wckvmqnhbzga0xidbm1ir7640di8l"; }; - outputDocdev = "out"; + outputDevdoc = "out"; preConfigure = " patchShebangs ./configure |