b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #67806 from rnhmjoj/arx

Browse source 
arx-libertatis: 2019-02-16 -> 2019-07-22
This commit is contained in:
worldofpeace 2019-10-19 23:25:54 +00:00 committed by GitHub
parent abf263fed7 4af7f6321e
commit ed48341148
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/games/arx-libertatis/default.nix
View file

@ -2,7 +2,8 @@
, openal, glm, freetype, libGLU, SDL2, epoxy , openal, glm, freetype, libGLU, SDL2, epoxy
, dejavu_fonts, inkscape, optipng, imagemagick , dejavu_fonts, inkscape, optipng, imagemagick
, withCrashReporter ? !stdenv.isDarwin , withCrashReporter ? !stdenv.isDarwin
, qt5 ? null , qtbase ? null
, wrapQtAppsHook ? null
, curl ? null , curl ? null
, gdb ? null , gdb ? null
}: }:
@ -11,24 +12,23 @@ with stdenv.lib;
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "arx-libertatis"; pname = "arx-libertatis";
version = "2019-02-16"; version = "2019-07-22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "arx"; owner = "arx";
repo = "ArxLibertatis"; repo = "ArxLibertatis";
rev = "fbce6ccbc7f58583f33f29b838c38ef527edc267"; rev = "db77aa26bb8612f711b65e72b1cd8cf6481700c7";
sha256 = "0qrygp09dqhpb5q6a1zl6l03qh9bi7xcahd8hy9177z1cix3k0kz"; sha256 = "0c88djyzjna17wjcvkgsfx3011m1rba5xdzdldy1hjmafpqgb4jj";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake inkscape imagemagick optipng cmake inkscape imagemagick optipng
]; ] ++ optionals withCrashReporter [ wrapQtAppsHook ];
buildInputs = [ buildInputs = [
zlib boost openal glm zlib boost openal glm
freetype libGLU SDL2 epoxy freetype libGLU SDL2 epoxy
] ++ optionals withCrashReporter [ qt5.qtbase curl ] ] ++ optionals withCrashReporter [ qtbase curl ]
++ optionals stdenv.isLinux [ gdb ]; ++ optionals stdenv.isLinux [ gdb ];
cmakeFlags = [ cmakeFlags = [
@ -38,11 +38,14 @@ stdenv.mkDerivation {
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
dontWrapQtApps = true;
postInstall = '' postInstall = ''
ln -sf \ ln -sf \
${dejavu_fonts}/share/fonts/truetype/DejaVuSansMono.ttf \ ${dejavu_fonts}/share/fonts/truetype/DejaVuSansMono.ttf \
$out/share/games/arx/misc/dejavusansmono.ttf $out/share/games/arx/misc/dejavusansmono.ttf
'' + optionalString withCrashReporter ''
wrapQtApp "$out/libexec/arxcrashreporter"
''; '';
meta = { meta = {

2
pkgs/top-level/all-packages.nix
View file

@ -22082,7 +22082,7 @@ in
arena = callPackage ../games/arena {}; arena = callPackage ../games/arena {};
arx-libertatis = callPackage ../games/arx-libertatis { arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis {
stdenv = gcc6Stdenv; stdenv = gcc6Stdenv;
}; };