Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7e5991ede748
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 43d9d1d7d8f5
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 9, 2020

  1. instead: 3.3.1 -> 3.3.2; fix compilation

    @marius851000
    marius851000 authored and Jon committed Sep 9, 2020
    Copy the full SHA
    43d9d1d View commit details
Showing with 7 additions and 2 deletions.
  1. +7 −2 pkgs/games/instead/default.nix
9 changes: 7 additions & 2 deletions pkgs/games/instead/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_mixer, pkgconfig, lua, zlib, unzip }:

let
version = "3.3.1";
version = "3.3.2";

# I took several games at random from http://instead.syscall.ru/games/
games = [
@@ -33,14 +33,19 @@ stdenv.mkDerivation {

src = fetchurl {
url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
sha256 = "10bppcdjnd0all71l5akdvy7fx0c8s8x0za9qxszs8cjmlv9z1q0";
sha256 = "u5j2kDKRvMQPsG8iA6uOBScuyE/e1BJIK2+qVL6jqQs=";
};

NIX_LDFLAGS = "-llua -lgcc_s";

nativeBuildInputs = [ pkgconfig unzip ];
buildInputs = [ SDL2 SDL2_ttf SDL2_image SDL2_mixer lua zlib ];

postPatch = ''
substituteInPlace configure.sh \
--replace "/tmp/sdl-test" $(mktemp)
'';

configurePhase = ''
{ echo 2; echo $out; } | ./configure.sh
'';