Merge commit '4c49205' into HEAD

2017-08-13 18:34:59 +02:00
parent 206faacbcb 4c49205676
commit 7ebcd39a0f
63 changed files with 83 additions and 82 deletions
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -19,7 +19,7 @@ in buildPythonPackage {

    export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
    ${stdenv.lib.optionalString stdenv.isDarwin ''
-      export QMAKESPEC="unsupported/macx-clang-libc++" # OS X target after bootstrapping phase \
+      export QMAKESPEC="unsupported/macx-clang-libc++" # macOS target after bootstrapping phase \
    ''}

    substituteInPlace configure.py \