Branch: refs/heads/staging
Home: https://github.com/NixOS/nixpkgs
Commit: 07849e749abb46b48db7123de8b40cb40bc08724
https://github.com/NixOS/nixpkgs/commit/07849e749abb46b48db7123de8b40cb40bc08724
Author: Will Dietz <[email protected]>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M pkgs/development/tools/build-managers/cmake/2.8.nix
M pkgs/development/tools/build-managers/cmake/default.nix
M pkgs/development/tools/build-managers/cmake/search-path-3.2.patch
M pkgs/development/tools/build-managers/cmake/search-path.patch
Log Message:
-----------
cmake: When there is no stdenv.glibc, still fix search paths.
Apply all of the fixups from preConfigure as well!
For testing purposes I added the following assert:
assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc);
To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?)
wasn't changed, which passes in the configurations I could think of.
Not including that since it seems like a bad requirement moving forward.
Commit: 48d7c7751a4a320a8bc68a54f9c528aa9bea1482
https://github.com/NixOS/nixpkgs/commit/48d7c7751a4a320a8bc68a54f9c528aa9bea1482
Author: Will Dietz <[email protected]>
Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths:
M pkgs/development/tools/build-managers/cmake/2.8.nix
M pkgs/development/tools/build-managers/cmake/default.nix
Log Message:
-----------
cmake: bootstrap in parallel
Builds on previous commit so this happens without needing stdenv.glibc.
Commit: 135a914ded4539aba8126e32583edbfd6d09a21c
https://github.com/NixOS/nixpkgs/commit/135a914ded4539aba8126e32583edbfd6d09a21c
Author: Vladimír Čunát <[email protected]>
Date: 2016-10-29 (Sat, 29 Oct 2016)
Changed paths:
M pkgs/development/tools/build-managers/cmake/2.8.nix
M pkgs/development/tools/build-managers/cmake/default.nix
M pkgs/development/tools/build-managers/cmake/search-path-3.2.patch
M pkgs/development/tools/build-managers/cmake/search-path.patch
Log Message:
-----------
Merge #19514: cmake: improve if without glibc
and bootstrap in parallel.
Compare: https://github.com/NixOS/nixpkgs/compare/cd436079fc7f...135a914ded45_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
