diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-25 12:38:00 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-25 12:38:00 +0200 |
| commit | b2ab860db3996f28236c9ed92f08831dd6c6c5ef (patch) | |
| tree | 750213b30b0ba839b1bef5116695df92976a2032 /pkgs/data/documentation | |
| parent | dae72e7e7dab5ae89d382471f4cccb888a5458e9 (diff) | |
| parent | fa05f332ebdf880abf147ad481288b704deb1367 (diff) | |
| download | nixpkgs-b2ab860db3996f28236c9ed92f08831dd6c6c5ef.tar nixpkgs-b2ab860db3996f28236c9ed92f08831dd6c6c5ef.tar.gz nixpkgs-b2ab860db3996f28236c9ed92f08831dd6c6c5ef.tar.bz2 nixpkgs-b2ab860db3996f28236c9ed92f08831dd6c6c5ef.tar.lz nixpkgs-b2ab860db3996f28236c9ed92f08831dd6c6c5ef.tar.xz nixpkgs-b2ab860db3996f28236c9ed92f08831dd6c6c5ef.tar.zst nixpkgs-b2ab860db3996f28236c9ed92f08831dd6c6c5ef.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data/documentation')
| -rw-r--r-- | pkgs/data/documentation/std-man-pages/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index 34597135500..d90fa99dd70 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { name = "std-man-pages-4.4.0"; @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { cp -R * $out/share/man ''; - meta = { - description = "C++ STD manual pages"; - homepage = https://gcc.gnu.org/; - license = "GPL/LGPL"; - platforms = stdenv.lib.platforms.unix; + meta = with lib; { + description = "GCC C++ STD manual pages"; + homepage = "https://gcc.gnu.org/"; + license = with licenses; [ fdl12Plus ]; + platforms = platforms.unix; }; } |