public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
This commit is contained in:
Eelco Dolstra
2014-07-28 11:30:49 +02:00
parent 3e4a382d67 30431e7160
commit f64d84698e
217 changed files with 2107 additions and 2941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/minecraft/default.nix
+3 -1
View File
@@ -1,6 +1,8 @@
{stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
{ stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
, mesa, openal, alsaOss }:
assert jre ? architecture;
stdenv.mkDerivation {
name = "minecraft-2013.07.01";