Shea Levy
|
c45372f038
|
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
|
2015-02-02 21:14:28 -05:00 |
|
Matej Cotman
|
617d11be2b
|
nodewebkit: add 0.11.2
|
2015-01-22 05:19:06 +01:00 |
|
Eric Seidel
|
f3c6827373
|
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
|
2015-01-14 20:27:55 -08:00 |
|
John Wiegley
|
28b6fb61e6
|
Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
|
2014-12-26 11:06:21 -06:00 |
|
Matej Cotman
|
77fa9da425
|
properly patch nodewebkit
|
2014-09-13 10:04:37 +02:00 |
|
Peter Simons
|
2d326e5032
|
Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
pkgs/desktops/e18/enlightenment.nix
|
2014-08-04 16:51:47 +02:00 |
|
Matej Cotman
|
b1ba1689bd
|
zed: build from source, ditch the installer, upgrade node-webkit
|
2014-07-30 12:43:24 +02:00 |
|
Eelco Dolstra
|
40f7b0f9df
|
Another attempt to eradicate ensureDir
See c556a6ea46.
|
2014-06-30 14:56:10 +02:00 |
|
Jaka Hudoklin
|
d0c0132fb0
|
node_webkit: fix hash for i686-linux
|
2014-04-19 10:45:03 +01:00 |
|
Jaka Hudoklin
|
58e0383d93
|
Add node-webkit, app runtime based on Chromium and node.js
|
2014-03-15 09:43:56 +00:00 |
|