diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:31 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:49 +0200 |
| commit | f64d84698eb3f4d833e846336ff99a73331c31f7 (patch) | |
| tree | 1120886b680851bc8b8f8d337af3503ecd4a3d71 /pkgs/games/minecraft | |
| parent | 3e4a382d6753a057256c7ef1e9f52ae9e07bd677 (diff) | |
| parent | 30431e71608576baf880567b2894ad2a542f8d5e (diff) | |
| download | nixpkgs-f64d84698eb3f4d833e846336ff99a73331c31f7.tar nixpkgs-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.gz nixpkgs-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.bz2 nixpkgs-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.lz nixpkgs-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.xz nixpkgs-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.zst nixpkgs-f64d84698eb3f4d833e846336ff99a73331c31f7.zip | |
Merge remote-tracking branch 'origin/master' into staging
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
Diffstat (limited to 'pkgs/games/minecraft')
| -rw-r--r-- | pkgs/games/minecraft/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index b4ec7eb311f..9f79dd70c6a 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -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"; |