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

0ad: 0.0.22 -> 0.0.23 (#40807)

Browse Source
This commit is contained in:
Peter Hoeg 2018-05-21 03:32:03 +08:00 committed by xeji
parent d0f3fc1be4
commit d7679fb2b5
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/games/0ad/data.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl }: { stdenv, fetchurl, zeroad-unwrapped }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "0ad-data-${version}"; name = "0ad-data-${version}";
version = "0.0.22"; inherit (zeroad-unwrapped) version;
src = fetchurl { src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
sha256 = "0vknk9ay9h2p34r7mym2g066f3s3c5d5vmap0ckcs5b86h5cscjc"; sha256 = "1b6qcvd8yyyxavgdwpcs7asmln3xgnvjkglz6ggvwb956x37ggzx";
}; };
installPhase = '' installPhase = ''

4
pkgs/games/0ad/default.nix
View File

@ -1,10 +1,10 @@
{ newScope }: { wxGTK, newScope }:
let let
callPackage = newScope self; callPackage = newScope self;
self = { self = {
zeroad-unwrapped = callPackage ./game.nix { }; zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; };
zeroad-data = callPackage ./data.nix { }; zeroad-data = callPackage ./data.nix { };

21
pkgs/games/0ad/game.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, callPackage, perl, fetchurl, python2 { stdenv, lib, callPackage, perl, fetchurl, python2
, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng , pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium
, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL, SDL2 , openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL2
, gloox, nvidia-texture-tools , gloox, nvidia-texture-tools
, withEditor ? true, wxGTK ? null , withEditor ? true, wxGTK ? null
}: }:
@ -10,11 +10,11 @@ assert withEditor -> wxGTK != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "0ad-${version}"; name = "0ad-${version}";
version = "0.0.22"; version = "0.0.23";
src = fetchurl { src = fetchurl {
url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
sha256 = "1cgmr4g5g9wv36v7ylbrvqhsjwgcsdgbqwc8zlqmnayk9zgkdpgx"; sha256 = "0qz1sg4n5y766qwgi63drrrx6k17kk0rcnn9a4a9crllk2vf78fg";
}; };
nativeBuildInputs = [ python2 perl pkgconfig ]; nativeBuildInputs = [ python2 perl pkgconfig ];
@ -23,14 +23,13 @@ stdenv.mkDerivation rec {
spidermonkey_38 boost icu libxml2 libpng libjpeg spidermonkey_38 boost icu libxml2 libpng libjpeg
zlib curl libogg libvorbis enet miniupnpc openal zlib curl libogg libvorbis enet miniupnpc openal
libGLU_combined xproto libX11 libXcursor nspr SDL2 gloox libGLU_combined xproto libX11 libXcursor nspr SDL2 gloox
nvidia-texture-tools nvidia-texture-tools libsodium
] ++ lib.optional withEditor wxGTK; ] ++ lib.optional withEditor wxGTK;
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
"-I${xproto}/include/X11" "-I${xproto}/include/X11"
"-I${libX11.dev}/include/X11" "-I${libX11.dev}/include/X11"
"-I${libXcursor.dev}/include/X11" "-I${libXcursor.dev}/include/X11"
"-I${SDL.dev}/include/SDL"
"-I${SDL2}/include/SDL2" "-I${SDL2}/include/SDL2"
]; ];
@ -77,16 +76,14 @@ stdenv.mkDerivation rec {
''} ''}
# Copy l10n data. # Copy l10n data.
mkdir -p "$out"/share/0ad/data install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/*
cp -r binaries/data/l10n "$out"/share/0ad/data
# Copy libraries. # Copy libraries.
mkdir -p "$out"/lib/0ad install -Dm644 -t $out/lib/0ad binaries/system/*.so
cp binaries/system/*.so "$out"/lib/0ad/
# Copy icon. # Copy icon.
install -D build/resources/0ad.png "$out"/share/icons/hicolor/128x128/0ad.png install -D build/resources/0ad.png $out/share/icons/hicolor/128x128/0ad.png
install -D build/resources/0ad.desktop "$out"/share/applications/0ad.desktop install -D build/resources/0ad.desktop $out/share/applications/0ad.desktop
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/top-level/all-packages.nix
View File

@ -19736,7 +19736,9 @@ with pkgs;
keen4 = callPackage ../games/keen4 { }; keen4 = callPackage ../games/keen4 { };
zeroadPackages = callPackage ../games/0ad { }; zeroadPackages = callPackage ../games/0ad {
wxGTK = wxGTK30;
};
zeroad = zeroadPackages.zeroad; zeroad = zeroadPackages.zeroad;