Merge pull request #136808 from prusnak/sdlpop

sdlpop: 1.21 -> 1.22

authored by Pavol Rusnak and committed by GitHub e422b490 8b76d20f

+6 -4
+6 -4
pkgs/games/sdlpop/default.nix
··· 8 9 stdenv.mkDerivation rec { 10 pname = "sdlpop"; 11 - version = "1.21"; 12 13 src = fetchFromGitHub { 14 owner = "NagyD"; 15 repo = "SDLPoP"; 16 rev = "v${version}"; 17 - sha256 = "1q4mnyg8v4420f1bp24v8lgi335vijdv61yi3fan14jgfzl38l7w"; 18 }; 19 20 nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; 21 buildInputs = [ SDL2 SDL2_image ]; 22 23 makeFlags = [ "-C" "src" ]; 24 25 preBuild = '' 26 - substituteInPlace src/Makefile --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}gcc" 27 ''; 28 29 # The prince binary expects two things of the working directory it is called from: ··· 63 license = licenses.gpl3Plus; 64 maintainers = with maintainers; [ iblech ]; 65 platforms = platforms.unix; 66 - broken = stdenv.isDarwin; 67 }; 68 }
··· 8 9 stdenv.mkDerivation rec { 10 pname = "sdlpop"; 11 + version = "1.22"; 12 13 src = fetchFromGitHub { 14 owner = "NagyD"; 15 repo = "SDLPoP"; 16 rev = "v${version}"; 17 + sha256 = "1yy5r1r0hv0xggk8qd8bwk2zy7abpv89nikq4flqgi53fc5q9xl7"; 18 }; 19 20 nativeBuildInputs = [ pkg-config makeWrapper copyDesktopItems ]; 21 + 22 buildInputs = [ SDL2 SDL2_image ]; 23 24 makeFlags = [ "-C" "src" ]; 25 26 preBuild = '' 27 + substituteInPlace src/Makefile \ 28 + --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \ 29 + --replace "CFLAGS += -I/opt/local/include" "CFLAGS += -I${SDL2.dev}/include/SDL2 -I${SDL2_image}/include/SDL2" 30 ''; 31 32 # The prince binary expects two things of the working directory it is called from: ··· 66 license = licenses.gpl3Plus; 67 maintainers = with maintainers; [ iblech ]; 68 platforms = platforms.unix; 69 }; 70 }