diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-03-16 17:16:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-03-16 22:36:36 +0000 |
| commit | cb6d0ec12187e0c2c11b203f3d8fa62790628141 (patch) | |
| tree | 0ca0fedc67d5676e89438cffa3e0865eee0962e4 /nixpkgs/pkgs/games/arx-libertatis | |
| parent | 4d83b8e578d3a0b78d2694921c944172b009036a (diff) | |
| parent | da1a2b1eeafa66b4419b4f275396d8a731eccb61 (diff) | |
| download | nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.gz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.bz2 nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.lz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.xz nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.tar.zst nixlib-cb6d0ec12187e0c2c11b203f3d8fa62790628141.zip | |
Merge commit 'da1a2b1eeafa66b4419b4f275396d8a731eccb61'
Diffstat (limited to 'nixpkgs/pkgs/games/arx-libertatis')
| -rw-r--r-- | nixpkgs/pkgs/games/arx-libertatis/default.nix | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/games/arx-libertatis/default.nix b/nixpkgs/pkgs/games/arx-libertatis/default.nix index 1ac5ce5007d9..a8e9063a35f4 100644 --- a/nixpkgs/pkgs/games/arx-libertatis/default.nix +++ b/nixpkgs/pkgs/games/arx-libertatis/default.nix @@ -1,24 +1,36 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, boost, - openal, glm, freetype, libGLU_combined, glew, SDL2, - dejavu_fonts, inkscape, optipng, imagemagick }: +{ stdenv, fetchFromGitHub, cmake, zlib, boost +, openal, glm, freetype, libGLU, SDL2, epoxy +, dejavu_fonts, inkscape, optipng, imagemagick +, withCrashReporter ? !stdenv.isDarwin +, qt5 ? null +, curl ? null +, gdb ? null +}: + +with stdenv.lib; stdenv.mkDerivation rec { name = "arx-libertatis-${version}"; - version = "2018-08-26"; + version = "2019-02-16"; src = fetchFromGitHub { owner = "arx"; repo = "ArxLibertatis"; - rev = "7b551739cc22fa25dae83bcc1a2b784ddecc729c"; - sha256 = "1ybv3p74rywn0ajdbw7pyk7pd7py1db9h6x2pav2d28ndkkj4z8n"; + rev = "fbce6ccbc7f58583f33f29b838c38ef527edc267"; + sha256 = "0qrygp09dqhpb5q6a1zl6l03qh9bi7xcahd8hy9177z1cix3k0kz"; }; - buildInputs = [ - cmake zlib boost openal glm - freetype libGLU_combined glew SDL2 inkscape - optipng imagemagick + + nativeBuildInputs = [ + cmake inkscape imagemagick optipng ]; + buildInputs = [ + zlib boost openal glm + freetype libGLU SDL2 epoxy + ] ++ optionals withCrashReporter [ qt5.qtbase curl ] + ++ optionals stdenv.isLinux [ gdb ]; + cmakeFlags = [ "-DDATA_DIR_PREFIXES=$out/share" "-DImageMagick_convert_EXECUTABLE=${imagemagick.out}/bin/convert" @@ -33,7 +45,7 @@ stdenv.mkDerivation rec { $out/share/games/arx/misc/dejavusansmono.ttf ''; - meta = with stdenv.lib; { + meta = { description = '' A cross-platform, open source port of Arx Fatalis, a 2002 first-person role-playing game / dungeon crawler |