diff options
| author | Peter Hoeg <peter@hoeg.com> | 2018-05-21 03:32:03 +0800 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-20 21:32:03 +0200 |
| commit | d7679fb2b5a1c22b9e8a9b3c82e1119737ba1dbe (patch) | |
| tree | 09cf1c3619ba04cd802aee6776712e7dda6c2b85 /pkgs/games/0ad | |
| parent | d0f3fc1be408d3b3c42330d0c007542569faf192 (diff) | |
| download | nixpkgs-d7679fb2b5a1c22b9e8a9b3c82e1119737ba1dbe.tar nixpkgs-d7679fb2b5a1c22b9e8a9b3c82e1119737ba1dbe.tar.gz nixpkgs-d7679fb2b5a1c22b9e8a9b3c82e1119737ba1dbe.tar.bz2 nixpkgs-d7679fb2b5a1c22b9e8a9b3c82e1119737ba1dbe.tar.lz nixpkgs-d7679fb2b5a1c22b9e8a9b3c82e1119737ba1dbe.tar.xz nixpkgs-d7679fb2b5a1c22b9e8a9b3c82e1119737ba1dbe.tar.zst nixpkgs-d7679fb2b5a1c22b9e8a9b3c82e1119737ba1dbe.zip | |
0ad: 0.0.22 -> 0.0.23 (#40807)
Diffstat (limited to 'pkgs/games/0ad')
| -rw-r--r-- | pkgs/games/0ad/data.nix | 6 | ||||
| -rw-r--r-- | pkgs/games/0ad/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/0ad/game.nix | 21 |
3 files changed, 14 insertions, 17 deletions
diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix index 2c6abd7972f..20921a61b8c 100644 --- a/pkgs/games/0ad/data.nix +++ b/pkgs/games/0ad/data.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, zeroad-unwrapped }: stdenv.mkDerivation rec { name = "0ad-data-${version}"; - version = "0.0.22"; + inherit (zeroad-unwrapped) version; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz"; - sha256 = "0vknk9ay9h2p34r7mym2g066f3s3c5d5vmap0ckcs5b86h5cscjc"; + sha256 = "1b6qcvd8yyyxavgdwpcs7asmln3xgnvjkglz6ggvwb956x37ggzx"; }; installPhase = '' diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index 983e8accc20..d53942766bb 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -1,10 +1,10 @@ -{ newScope }: +{ wxGTK, newScope }: let callPackage = newScope self; self = { - zeroad-unwrapped = callPackage ./game.nix { }; + zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; }; zeroad-data = callPackage ./data.nix { }; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 4d5a4fe8379..0cf1b6f5e67 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,7 +1,7 @@ { 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 -, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL, SDL2 +, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL2 , gloox, nvidia-texture-tools , withEditor ? true, wxGTK ? null }: @@ -10,11 +10,11 @@ assert withEditor -> wxGTK != null; stdenv.mkDerivation rec { name = "0ad-${version}"; - version = "0.0.22"; + version = "0.0.23"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz"; - sha256 = "1cgmr4g5g9wv36v7ylbrvqhsjwgcsdgbqwc8zlqmnayk9zgkdpgx"; + sha256 = "0qz1sg4n5y766qwgi63drrrx6k17kk0rcnn9a4a9crllk2vf78fg"; }; nativeBuildInputs = [ python2 perl pkgconfig ]; @@ -23,14 +23,13 @@ stdenv.mkDerivation rec { spidermonkey_38 boost icu libxml2 libpng libjpeg zlib curl libogg libvorbis enet miniupnpc openal libGLU_combined xproto libX11 libXcursor nspr SDL2 gloox - nvidia-texture-tools + nvidia-texture-tools libsodium ] ++ lib.optional withEditor wxGTK; NIX_CFLAGS_COMPILE = [ "-I${xproto}/include/X11" "-I${libX11.dev}/include/X11" "-I${libXcursor.dev}/include/X11" - "-I${SDL.dev}/include/SDL" "-I${SDL2}/include/SDL2" ]; @@ -77,16 +76,14 @@ stdenv.mkDerivation rec { ''} # Copy l10n data. - mkdir -p "$out"/share/0ad/data - cp -r binaries/data/l10n "$out"/share/0ad/data + install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/* # Copy libraries. - mkdir -p "$out"/lib/0ad - cp binaries/system/*.so "$out"/lib/0ad/ + install -Dm644 -t $out/lib/0ad binaries/system/*.so # Copy icon. - 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.png $out/share/icons/hicolor/128x128/0ad.png + install -D build/resources/0ad.desktop $out/share/applications/0ad.desktop ''; meta = with stdenv.lib; { |