Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: abf263fed787
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ed483411486b
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 19, 2019

  1. arx-libertatis: use wrapQtAppsHook

    @rnhmjoj
    rnhmjoj committed Oct 19, 2019
    Copy the full SHA
    152402b View commit details

  2. arx-libertatis: 2019-02-16 -> 2019-07-22

    @rnhmjoj
    rnhmjoj committed Oct 19, 2019
    Copy the full SHA
    4af7f63 View commit details

  3. Merge pull request #67806 from rnhmjoj/arx 

    arx-libertatis: 2019-02-16 -> 2019-07-22
    @worldofpeace
    worldofpeace authored Oct 19, 2019
    Copy the full SHA
    ed48341 View commit details
Showing with 13 additions and 10 deletions.
  1. +12 −9 pkgs/games/arx-libertatis/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
21 changes: 12 additions & 9 deletions pkgs/games/arx-libertatis/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = {
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -22082,7 +22082,7 @@ in

arena = callPackage ../games/arena {};

arx-libertatis = callPackage ../games/arx-libertatis {
arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis {
stdenv = gcc6Stdenv;
};