Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 7a9400d338a2215314ab5acd3af0e3699bce9d4d
https://github.com/NixOS/nixpkgs/commit/7a9400d338a2215314ab5acd3af0e3699bce9d4d
Author: Anthony Cowley <[email protected]>
Date: 2016-12-08 (Thu, 08 Dec 2016)
Changed paths:
M pkgs/development/libraries/qt-5/5.6/default.nix
A pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch
M pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
M pkgs/development/libraries/qt-5/5.6/qtbase/series
A pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
A pkgs/development/libraries/qt-5/qmake-hook-darwin.sh
A pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
Log Message:
-----------
qt5.6: darwin compatibility
- qtbase builds on darwin
- Downstream qmake and cmake build configurations supported
Darwin-specific changes:
Prevent `qmake -project` from adding build support files in the temp
directory to the project.
Shrink the temp directory used for building with qmake.
The issue here is that `lndir` recreates the entire directory structure
of the module we are merging into the temporary build environment. On
darwin, the framework directory structures mean that this shadow
directory tree is 17MB even though the file contents are all symlinks
into the store.
To address this, we symlink the framework directories explicitly and
use `lndir` for everything else.
Commit: 2a02544b34a15470cdf04b1e1139edaeedd398a9
https://github.com/NixOS/nixpkgs/commit/2a02544b34a15470cdf04b1e1139edaeedd398a9
Author: Thomas Tuegel <[email protected]>
Date: 2016-12-09 (Fri, 09 Dec 2016)
Changed paths:
M pkgs/development/libraries/qt-5/5.6/default.nix
A pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths-darwin.patch
M pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
M pkgs/development/libraries/qt-5/5.6/qtbase/series
A pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
A pkgs/development/libraries/qt-5/qmake-hook-darwin.sh
A pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
Log Message:
-----------
Merge pull request #21009 from acowley/qt5.6.2-darwin
qt5.6: darwin compatibility
Compare: https://github.com/NixOS/nixpkgs/compare/d1a5dc0b1ca5...2a02544b34a1_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
