public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '4c49205' into HEAD

Browse Source
This commit is contained in:
Frederik Rietdijk
2017-08-13 18:34:59 +02:00
parent 206faacbcb 4c49205676
commit 7ebcd39a0f
63 changed files with 83 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/text/gnugrep/default.nix
View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation {
#doCheck = !stdenv.isDarwin && !stdenv.isSunOS && !stdenv.isCygwin && !stdenv.isFreeBSD;
doCheck = false;
# On Mac OS X, force use of mkdir -p, since Grep's fallback
# On macOS, force use of mkdir -p, since Grep's fallback
# (./install-sh) is broken.
preConfigure = ''
export MKDIR_P="mkdir -p"

2
pkgs/tools/text/popfile/default.nix
View File

@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
homepage = http://getpopfile.org;
license = stdenv.lib.licenses.gpl2;
# Should work on OS X, but havent tested it.
# Should work on macOS, but havent tested it.
# Windows support is more complicated.
# http://getpopfile.org/docs/faq:systemrequirements
platforms = stdenv.lib.platforms.linux;