Commit Graph

6 Commits

Author SHA1 Message Date
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
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Shea Levy
9a6cf14ef1 Fix tarball
svn path=/nixpkgs/trunk/; revision=32432
2012-02-20 17:25:35 +00:00
Peter Simons
c96d4bd72e and yet it moves: gravity/physics game
Demo and commercial version are supported.

This nix expression shows some of the techniques used to package
closed-source binaries.

Committed on behalf of Mathijs Kwik.

svn path=/nixpkgs/trunk/; revision=32408
2012-02-19 21:36:54 +00:00