xmoto: 0.6.1 -> 0.6.2
The primary change is the switch to SDL2. Changes: https://github.com/xmoto/xmoto/releases/tag/v0.6.2
This commit is contained in:
parent
ba0c72cea4
commit
7d09678df5
@ -1,26 +1,19 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gettext, makeWrapper, bzip2
|
{ lib, stdenv, fetchFromGitHub, cmake, gettext, makeWrapper, bzip2
|
||||||
, curl, libjpeg, libxml2, xz, lua, ode, libGL, libpng, SDL, SDL_mixer, SDL_net
|
, curl, libjpeg, libxml2, xz, lua, ode, libGL, libGLU, libpng
|
||||||
, SDL_ttf, sqlite, libxdg_basedir, zlib }:
|
, pkg-config, SDL2, SDL2_mixer, SDL2_net , SDL2_ttf
|
||||||
|
, sqlite, libxdg_basedir, zlib }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "xmoto";
|
pname = "xmoto";
|
||||||
version = "0.6.1";
|
version = "0.6.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = pname;
|
owner = pname;
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = "v${version}";
|
||||||
sha256 = "00f5ha79lfa2iiaz66wl0hl5dapa1l15qdr7m7knzi0ll7j6z66n";
|
hash = "sha256-n58GB5HA50ybSq0ssvJMq+p3I3JThHUGLZ5sHy/245M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Fix build with Nix
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/xmoto/xmoto/commit/536dcc7ec77a4c4c454b86220e85b1cb3cd1c7f7.patch";
|
|
||||||
sha256 = "0h9lld668jrbmrqva89zqwp63jiagjj86prkxzx6372p3kk9y7g7";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
gettext
|
gettext
|
||||||
@ -36,16 +29,22 @@ stdenv.mkDerivation rec {
|
|||||||
lua
|
lua
|
||||||
ode
|
ode
|
||||||
libGL
|
libGL
|
||||||
|
libGLU
|
||||||
libpng
|
libpng
|
||||||
SDL
|
SDL2
|
||||||
SDL_mixer
|
SDL2_mixer
|
||||||
SDL_net
|
SDL2_net
|
||||||
SDL_ttf
|
SDL2_ttf
|
||||||
sqlite
|
sqlite
|
||||||
libxdg_basedir
|
libxdg_basedir
|
||||||
zlib
|
zlib
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# Should normally come from SDL2_ttf pkg-config, but xmoto does not
|
||||||
|
# use it and uses include directories directly. Let's re-inject the
|
||||||
|
# path here.
|
||||||
|
env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2";
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
wrapProgram "$out/bin/xmoto" \
|
wrapProgram "$out/bin/xmoto" \
|
||||||
--prefix XDG_DATA_DIRS : "$out/share/"
|
--prefix XDG_DATA_DIRS : "$out/share/"
|
||||||
|
Loading…
Reference in New Issue
Block a user