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

arx-libertatis: use wrapQtAppsHook

This commit is contained in:
rnhmjoj 2019-08-31 01:48:33 +02:00
parent becf5adaeb
commit 152402b528
No known key found for this signature in database
GPG Key ID: BFBAF4C975F76450
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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
}: }:
@ -20,15 +21,14 @@ stdenv.mkDerivation rec {
sha256 = "0qrygp09dqhpb5q6a1zl6l03qh9bi7xcahd8hy9177z1cix3k0kz"; sha256 = "0qrygp09dqhpb5q6a1zl6l03qh9bi7xcahd8hy9177z1cix3k0kz";
}; };
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 rec {
]; ];
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

@ -21799,7 +21799,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;
}; };