diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-19 23:25:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-19 23:25:54 +0000 |
| commit | ed483411486b99a7be264b8afd5e3cb7f6c104d5 (patch) | |
| tree | 4023c2df3102c642dfbc2e70d4c59244fcc0e571 /pkgs | |
| parent | abf263fed7870e3b8cc6ecc115d778aad595ab89 (diff) | |
| parent | 4af7f6321e54db0964fe051326d2221cba16ac7c (diff) | |
| download | nixlib-ed483411486b99a7be264b8afd5e3cb7f6c104d5.tar nixlib-ed483411486b99a7be264b8afd5e3cb7f6c104d5.tar.gz nixlib-ed483411486b99a7be264b8afd5e3cb7f6c104d5.tar.bz2 nixlib-ed483411486b99a7be264b8afd5e3cb7f6c104d5.tar.lz nixlib-ed483411486b99a7be264b8afd5e3cb7f6c104d5.tar.xz nixlib-ed483411486b99a7be264b8afd5e3cb7f6c104d5.tar.zst nixlib-ed483411486b99a7be264b8afd5e3cb7f6c104d5.zip | |
Merge pull request #67806 from rnhmjoj/arx
arx-libertatis: 2019-02-16 -> 2019-07-22
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/arx-libertatis/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index c224784e8f24..d3f18d4c2182 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 }: @@ -11,24 +12,23 @@ with stdenv.lib; stdenv.mkDerivation { pname = "arx-libertatis"; - version = "2019-02-16"; + version = "2019-07-22"; src = fetchFromGitHub { - owner = "arx"; - repo = "ArxLibertatis"; - rev = "fbce6ccbc7f58583f33f29b838c38ef527edc267"; - sha256 = "0qrygp09dqhpb5q6a1zl6l03qh9bi7xcahd8hy9177z1cix3k0kz"; + owner = "arx"; + repo = "ArxLibertatis"; + rev = "db77aa26bb8612f711b65e72b1cd8cf6481700c7"; + sha256 = "0c88djyzjna17wjcvkgsfx3011m1rba5xdzdldy1hjmafpqgb4jj"; }; - 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 { ]; 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 = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6f68f87f917..465c1a2e6a91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22082,7 +22082,7 @@ in arena = callPackage ../games/arena {}; - arx-libertatis = callPackage ../games/arx-libertatis { + arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { stdenv = gcc6Stdenv; }; |