diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-28 14:39:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-10 08:52:36 +0000 |
| commit | 693e64ef7421374338ddb1dc12b9573feec75972 (patch) | |
| tree | 2526ac075d248699c35d63e04499890ee4381f5f /nixpkgs/pkgs/games/devilutionx | |
| parent | 7014df2256694d97093d6f2bb1db340d346dea88 (diff) | |
| parent | 8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17 (diff) | |
| download | nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.gz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.bz2 nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.lz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.xz nixlib-693e64ef7421374338ddb1dc12b9573feec75972.tar.zst nixlib-693e64ef7421374338ddb1dc12b9573feec75972.zip | |
Merge commit '8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17'
Diffstat (limited to 'nixpkgs/pkgs/games/devilutionx')
| -rw-r--r-- | nixpkgs/pkgs/games/devilutionx/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/games/devilutionx/default.nix b/nixpkgs/pkgs/games/devilutionx/default.nix index 0f89bdeabb4c..fa457b1f1bcc 100644 --- a/nixpkgs/pkgs/games/devilutionx/default.nix +++ b/nixpkgs/pkgs/games/devilutionx/default.nix @@ -1,15 +1,20 @@ { lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: + stdenv.mkDerivation rec { pname = "devilutionx"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; rev = version; - sha256 = "03w3bgmzwsbycx3fzvn47fsmabl069gw77yn2fqg89wlgaw1yrr9"; + sha256 = "sha256-PgYlNO1p78d0uiL474bDJOL++SxJfeBLK65czdaylHU="; }; + postPatch = '' + substituteInPlace Source/init.cpp --replace "/usr/share/diasurgical/devilutionx/" "${placeholder "out"}/share/diasurgical/devilutionx/" + ''; + NIX_CFLAGS_COMPILE = [ "-I${SDL2_ttf}/include/SDL2" ''-DTTF_FONT_PATH="${placeholder "out"}/share/fonts/truetype/CharisSILB.ttf"'' @@ -17,6 +22,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBINARY_RELEASE=ON" + "-DVERSION_NUM=${version}" ]; nativeBuildInputs = [ pkg-config cmake ]; @@ -31,6 +37,7 @@ stdenv.mkDerivation rec { '' else '' install -Dm755 -t $out/bin devilutionx install -Dt $out/share/fonts/truetype ../Packaging/resources/CharisSILB.ttf + install -Dt $out/share/diasurgical/devilutionx ../Packaging/resources/devilutionx.mpq # TODO: icons and .desktop (see Packages/{debian,fedora}/*) '') + '' |