public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #120838 from sternenseemann/soldat-unstable-2021-04-27 

soldat-unstable: unstable-2021-02-09 -> unstable-2021-04-27
This commit is contained in:
Sandro 2021-04-30 13:56:50 +02:00 committed by GitHub
parent d7e9d65ea2 712f49a053
commit cf467975bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/games/soldat-unstable/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, fpc, zip, makeWrapper { lib, stdenv, fetchFromGitHub, fpc, zip, makeWrapper
, SDL2, freetype, physfs, openal, gamenetworkingsockets , SDL2, freetype, physfs, openal, gamenetworkingsockets
, xorg, autoPatchelfHook , xorg, autoPatchelfHook
}: }:
@ -39,14 +39,14 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "soldat"; pname = "soldat";
version = "unstable-2021-02-09"; version = "unstable-2021-04-27";
src = fetchFromGitHub { src = fetchFromGitHub {
name = "soldat"; name = "soldat";
owner = "Soldat"; owner = "Soldat";
repo = "soldat"; repo = "soldat";
rev = "c304c3912ca7a88461970a859049d217a44c6375"; rev = "4d17667c316ff08934e97448b7f290a8dc434e81";
sha256 = "09sl2zybfcmnl2n3qghp0gylmr71y01534l6nq0y9llbdy0bf306"; sha256 = "1pf557psmhfaagblfwdn36cw80j7bgs0lgjq8hmjbv58dysw3jdb";
}; };
nativeBuildInputs = [ fpc makeWrapper autoPatchelfHook ]; nativeBuildInputs = [ fpc makeWrapper autoPatchelfHook ];
@ -54,15 +54,6 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL2 freetype physfs openal gamenetworkingsockets ]; buildInputs = [ SDL2 freetype physfs openal gamenetworkingsockets ];
runtimeDependencies = [ xorg.libX11 ]; runtimeDependencies = [ xorg.libX11 ];
patches = [
# fix an argument parsing issue which prevents
# us from passing nix store paths to soldat
(fetchpatch {
url = "https://github.com/sternenseemann/soldat/commit/9f7687430f5fe142c563b877d2206f5c9bbd5ca0.patch";
sha256 = "0wsrazb36i7v4idg06jlzfhqwf56q9szzz7jp5cg4wsvcky3wajf";
})
];
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild