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: 74e25d2f534d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7827ea7e7f0b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 18, 2019

  1. arx-libertatis: 2018-08-26 -> 2019-02-16 (#57873) 

    (cherry picked from commit d10f3e9)
    @rnhmjoj @xeji
    rnhmjoj authored and xeji committed Mar 18, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    7827ea7 View commit details
Showing with 23 additions and 11 deletions.
  1. +23 −11 pkgs/games/arx-libertatis/default.nix
34 changes: 23 additions & 11 deletions pkgs/games/arx-libertatis/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
{ stdenv, fetchFromGitHub, cmake, zlib, boost,
openal, glm, freetype, libGLU_combined, glew, SDL2,
dejavu_fonts, inkscape, optipng, imagemagick }:
{ stdenv, fetchFromGitHub, cmake, zlib, boost
, openal, glm, freetype, libGLU, SDL2, epoxy
, dejavu_fonts, inkscape, optipng, imagemagick
, withCrashReporter ? !stdenv.isDarwin
, qt5 ? null
, curl ? null
, gdb ? null
}:

with stdenv.lib;

stdenv.mkDerivation rec {
name = "arx-libertatis-${version}";
version = "2018-08-26";
version = "2019-02-16";

src = fetchFromGitHub {
owner = "arx";
repo = "ArxLibertatis";
rev = "7b551739cc22fa25dae83bcc1a2b784ddecc729c";
sha256 = "1ybv3p74rywn0ajdbw7pyk7pd7py1db9h6x2pav2d28ndkkj4z8n";
rev = "fbce6ccbc7f58583f33f29b838c38ef527edc267";
sha256 = "0qrygp09dqhpb5q6a1zl6l03qh9bi7xcahd8hy9177z1cix3k0kz";
};

buildInputs = [
cmake zlib boost openal glm
freetype libGLU_combined glew SDL2 inkscape
optipng imagemagick

nativeBuildInputs = [
cmake inkscape imagemagick optipng
];

buildInputs = [
zlib boost openal glm
freetype libGLU SDL2 epoxy
] ++ optionals withCrashReporter [ qt5.qtbase curl ]
++ optionals stdenv.isLinux [ gdb ];

cmakeFlags = [
"-DDATA_DIR_PREFIXES=$out/share"
"-DImageMagick_convert_EXECUTABLE=${imagemagick.out}/bin/convert"
@@ -33,7 +45,7 @@ stdenv.mkDerivation rec {
$out/share/games/arx/misc/dejavusansmono.ttf
'';

meta = with stdenv.lib; {
meta = {
description = ''
A cross-platform, open source port of Arx Fatalis, a 2002
first-person role-playing game / dungeon crawler