diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 13:44:40 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-17 13:45:21 +0200 |
| commit | cbabebcc2e3b884296fedf8591e04f59240b3939 (patch) | |
| tree | 54f637fbb59548753ac613ec3e4f56aae97a5e6e /pkgs/tools/text | |
| parent | 7a22083e1271869294a074cbe7a971f2d8abb4f4 (diff) | |
| parent | 93147d737d24f55d8da7257e24d840c9f9b1fe6c (diff) | |
| download | nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.gz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.bz2 nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.lz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.xz nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.tar.zst nixlib-cbabebcc2e3b884296fedf8591e04f59240b3939.zip | |
Merge branch 'master' into staging-next
Hydra: ?compare=1473892
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/diffutils/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 60628e2139ce..fff81fbc860a 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -20,9 +20,10 @@ stdenv.mkDerivation rec { stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr" ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/diffutils/diffutils.html; description = "Commands for showing the differences between files (diff, cmp, etc.)"; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl3; + platforms = platforms.unix; }; } |