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

Commits on Oct 21, 2019

  1. devilutionx: unstable-2019-07-28 -> 0.5.0 (#70971) 

    devilutionx: unstable-2019-07-28 -> 0.5.0
    @karolchmist @aanderse
    karolchmist authored and aanderse committed Oct 21, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    joshka Josh McKinney
    GPG key ID: 722287396A903BC5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    47f47b4 View commit details
Showing with 10 additions and 7 deletions.
  1. +10 −7 pkgs/games/devilutionx/default.nix
17 changes: 10 additions & 7 deletions pkgs/games/devilutionx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,38 @@
{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }:
stdenv.mkDerivation {
version = "unstable-2019-07-28";
stdenv.mkDerivation rec {
version = "0.5.0";
pname = "devilutionx";

src = fetchFromGitHub {
owner = "diasurgical";
repo = "devilutionX";
rev = "b2f358874705598ec139f290b21e340c73d250f6";
sha256 = "0s812km118qq5pzlzvzfndvag0mp6yzvm69ykc97frdiq608zw4f";
rev = version;
sha256 = "010hxj129zmsynvizk89vm2y29dcxsfi585czh3f03wfr38rxa6b";
};

NIX_CFLAGS_COMPILE = "-I${SDL2_ttf}/include/SDL2";

# compilation will fail due to -Werror=format-security
hardeningDisable = [ "format" ];

nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ];

installPhase = ''
runHook preInstall
'' + (if stdenv.isDarwin then ''
mkdir -p $out/Applications
mv devilutionx.app $out/Applications
'' else ''
mkdir -p $out/bin
cp devilutionx $out/bin
'') + ''
runHook postInstall
'';

meta = with stdenv.lib; {
homepage = "https://github.com/diasurgical/devilutionX";
description = "Diablo build for modern operating systems";
longDescription = "In order to play this game a copy of diabdat.mpq is required. Place a copy of diabdat.mpq in ~/.local/share/diasurgical/devilution before executing the game.";
license = licenses.unlicense;
maintainers = [ maintainers.karolchmist ];
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows;