nixpkgs-suyu/pkgs/os-specific
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
..
darwin Add an expression for Darwin's install_name_tool utility, which is required by several other builds. 2011-03-25 12:55:15 +00:00
gnu GNU Hurd: Update. 2011-11-19 14:27:46 +00:00
linux svn merge ^/nixpkgs/trunk 2012-01-08 16:01:12 +00:00
windows Making wxGTK stay wxGTK even cross-built, so I remove the wxMSW code I added 2010-05-06 19:19:22 +00:00