diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-03 10:25:14 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-03 10:25:14 +0100 |
| commit | 7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566 (patch) | |
| tree | f10b8dd05c774ed6cf9afba85426abbf4527f2a0 /pkgs/games | |
| parent | f08e3e38d4bf983480fcde77911136bab70d8e80 (diff) | |
| parent | 7e8454fb856573967a70f61116e15f879f2e3f6a (diff) | |
| download | nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.gz nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.bz2 nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.lz nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.xz nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.tar.zst nixpkgs-7aa2b0215b8ee8318c43ca7d7d64e7b055bf6566.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/devilutionx/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/games/hyperrogue/default.nix | 6 |
2 files changed, 13 insertions, 8 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 diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index b4f5e4f7f63..09ecd4279e4 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "10.5e"; + version = "11.2d"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; - rev = "v${version}"; - sha256 = "1sjr26if3xv8xv52app1hkxs0bbgbviagydm4mdwbxjpd6v3d1aa"; + rev = stdenv.lib.strings.stringAsChars (x: if x == "." then "" else x) "v${version}"; + sha256 = "0aj4xy5xjdj32l5mk8796ldh9d7h8rx35kgc1vr7acb4fhpppb0f"; }; CPPFLAGS = "-I${SDL.dev}/include/SDL"; |