diff options
author | rnhmjoj <rnhmjoj@inventati.org> | 2019-08-31 01:48:33 +0200 |
---|---|---|
committer | rnhmjoj <rnhmjoj@inventati.org> | 2019-10-19 10:41:35 +0200 |
commit | 152402b52818873c57a204c63c0a2ffa517461c5 (patch) | |
tree | d0229bfc767a90117ddf712d6f74448334a4f6f1 | |
parent | becf5adaebeb25e6379fc9f0d44f855494f7c696 (diff) | |
download | nixlib-152402b52818873c57a204c63c0a2ffa517461c5.tar nixlib-152402b52818873c57a204c63c0a2ffa517461c5.tar.gz nixlib-152402b52818873c57a204c63c0a2ffa517461c5.tar.bz2 nixlib-152402b52818873c57a204c63c0a2ffa517461c5.tar.lz nixlib-152402b52818873c57a204c63c0a2ffa517461c5.tar.xz nixlib-152402b52818873c57a204c63c0a2ffa517461c5.tar.zst nixlib-152402b52818873c57a204c63c0a2ffa517461c5.zip |
arx-libertatis: use wrapQtAppsHook
-rw-r--r-- | pkgs/games/arx-libertatis/default.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 5b1f240e7b5f..30682797bf88 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -2,7 +2,8 @@ , openal, glm, freetype, libGLU, SDL2, epoxy , dejavu_fonts, inkscape, optipng, imagemagick , withCrashReporter ? !stdenv.isDarwin -, qt5 ? null +, qtbase ? null +, wrapQtAppsHook ? null , curl ? null , gdb ? null }: @@ -20,15 +21,14 @@ stdenv.mkDerivation rec { sha256 = "0qrygp09dqhpb5q6a1zl6l03qh9bi7xcahd8hy9177z1cix3k0kz"; }; - nativeBuildInputs = [ cmake inkscape imagemagick optipng - ]; + ] ++ optionals withCrashReporter [ wrapQtAppsHook ]; buildInputs = [ zlib boost openal glm freetype libGLU SDL2 epoxy - ] ++ optionals withCrashReporter [ qt5.qtbase curl ] + ] ++ optionals withCrashReporter [ qtbase curl ] ++ optionals stdenv.isLinux [ gdb ]; cmakeFlags = [ @@ -38,11 +38,14 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; + dontWrapQtApps = true; postInstall = '' ln -sf \ ${dejavu_fonts}/share/fonts/truetype/DejaVuSansMono.ttf \ $out/share/games/arx/misc/dejavusansmono.ttf + '' + optionalString withCrashReporter '' + wrapQtApp "$out/libexec/arxcrashreporter" ''; meta = { @@ -51,10 +54,10 @@ stdenv.mkDerivation rec { first-person role-playing game / dungeon crawler developed by Arkane Studios. ''; - homepage = http://arx-libertatis.org/; - license = licenses.gpl3; + homepage = http://arx-libertatis.org/; + license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b574576b135..9e8946b5a455 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21799,7 +21799,7 @@ in arena = callPackage ../games/arena {}; - arx-libertatis = callPackage ../games/arx-libertatis { + arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { stdenv = gcc6Stdenv; }; |