diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-03-12 10:16:51 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-03-12 10:16:51 +0100 |
| commit | c7bac81c66d6fe13c829c8e4a34b2961556397ce (patch) | |
| tree | 0f85490fee23351bad637ea59e176f9f3e11f4fd /pkgs/os-specific | |
| parent | 28069d6aadf081520399d624d350ee1c22a132b2 (diff) | |
| parent | a3cf381435345d25d9deeab8f5684d937cfc83e1 (diff) | |
| parent | a445199db42a99560ae15838444a67bc19498cc1 (diff) | |
| download | nixlib-c7bac81c66d6fe13c829c8e4a34b2961556397ce.tar nixlib-c7bac81c66d6fe13c829c8e4a34b2961556397ce.tar.gz nixlib-c7bac81c66d6fe13c829c8e4a34b2961556397ce.tar.bz2 nixlib-c7bac81c66d6fe13c829c8e4a34b2961556397ce.tar.lz nixlib-c7bac81c66d6fe13c829c8e4a34b2961556397ce.tar.xz nixlib-c7bac81c66d6fe13c829c8e4a34b2961556397ce.tar.zst nixlib-c7bac81c66d6fe13c829c8e4a34b2961556397ce.zip | |
Merge 'mingw-w64' and 'darwin' into cross-win-osx.
Both branches have quite a lot in common, so it's time for a merge and do the cleanups with respect to both implementations and also generalize both implementations as much as possible. This also closes #1876. Conflicts: pkgs/development/interpreters/lua-5/5.2.nix pkgs/development/libraries/SDL/default.nix pkgs/development/libraries/glew/default.nix pkgs/top-level/all-packages.nix