diff options
author | Danylo Hlynskyi <abcz2.uprola@gmail.com> | 2020-01-03 00:02:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-03 00:02:42 +0200 |
commit | c9bf6aebaa6ef22b073bb3ed8a4ad090b3f104b4 (patch) | |
tree | 38dd4044017a5c6fe1d61eb05b508db76079ccb0 /pkgs/games | |
parent | 1c9af6e7c127799ed9c80303e9cc5da990a95d42 (diff) | |
parent | 2f040f691b6d89300bba6bd263574320cbf76b1c (diff) | |
download | nixpkgs-c9bf6aebaa6ef22b073bb3ed8a4ad090b3f104b4.tar nixpkgs-c9bf6aebaa6ef22b073bb3ed8a4ad090b3f104b4.tar.gz nixpkgs-c9bf6aebaa6ef22b073bb3ed8a4ad090b3f104b4.tar.bz2 nixpkgs-c9bf6aebaa6ef22b073bb3ed8a4ad090b3f104b4.tar.lz nixpkgs-c9bf6aebaa6ef22b073bb3ed8a4ad090b3f104b4.tar.xz nixpkgs-c9bf6aebaa6ef22b073bb3ed8a4ad090b3f104b4.tar.zst nixpkgs-c9bf6aebaa6ef22b073bb3ed8a4ad090b3f104b4.zip |
Merge pull request #76770 from dtzWill/update/devilutionx-1.0.0
devilutionx: 0.5.0 -> 1.0.0, install font file
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/devilutionx/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 3241e6dd387..ac7d61b31c7 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -1,16 +1,19 @@ { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: stdenv.mkDerivation rec { - version = "0.5.0"; + version = "1.0.0"; pname = "devilutionx"; src = fetchFromGitHub { owner = "diasurgical"; repo = "devilutionX"; rev = version; - sha256 = "010hxj129zmsynvizk89vm2y29dcxsfi585czh3f03wfr38rxa6b"; + sha256 = "0lx903gchda4bgr71469yn63rx5ya6xv9j1azx18nrv3sskrphn4"; }; - NIX_CFLAGS_COMPILE = "-I${SDL2_ttf}/include/SDL2"; + NIX_CFLAGS_COMPILE = [ + "-I${SDL2_ttf}/include/SDL2" + ''-DTTF_FONT_PATH="${placeholder "out"}/share/fonts/truetype/CharisSILB.ttf"'' + ]; nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libsodium SDL2 SDL2_mixer SDL2_ttf ]; @@ -22,8 +25,10 @@ stdenv.mkDerivation rec { mkdir -p $out/Applications mv devilutionx.app $out/Applications '' else '' - mkdir -p $out/bin - cp devilutionx $out/bin + install -Dm755 -t $out/bin devilutionx + install -Dt $out/share/fonts/truetype ../Packaging/resources/CharisSILB.ttf + + # TODO: icons and .desktop (see Packages/{debian,fedora}/*) '') + '' runHook postInstall |