diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-08-25 22:24:21 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-08-26 01:02:34 +0000 |
| commit | 0c48a3bf53af0458ad9a4a9315a51f043849f803 (patch) | |
| tree | 238610595d4b086fa750f93d96230049ec7cb761 /pkgs/games/gargoyle/default.nix | |
| parent | 5aefcd22a5514400ccaedb50ddc664c0d13eee1e (diff) | |
| download | nixlib-0c48a3bf53af0458ad9a4a9315a51f043849f803.tar nixlib-0c48a3bf53af0458ad9a4a9315a51f043849f803.tar.gz nixlib-0c48a3bf53af0458ad9a4a9315a51f043849f803.tar.bz2 nixlib-0c48a3bf53af0458ad9a4a9315a51f043849f803.tar.lz nixlib-0c48a3bf53af0458ad9a4a9315a51f043849f803.tar.xz nixlib-0c48a3bf53af0458ad9a4a9315a51f043849f803.tar.zst nixlib-0c48a3bf53af0458ad9a4a9315a51f043849f803.zip | |
gargoyle: 2017-03-12 -> 2017-05-17
Diffstat (limited to 'pkgs/games/gargoyle/default.nix')
| -rw-r--r-- | pkgs/games/gargoyle/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index ecee61513b42..7a461fbfa0d7 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchFromGitHub, jam, pkgconfig, gtk2, SDL, SDL_mixer, SDL_sound, smpeg, libvorbis }: +{ stdenv, fetchFromGitHub, jam, libtool, pkgconfig, gtk2, SDL, SDL_mixer, SDL_sound, smpeg, libvorbis }: let - jamenv = if stdenv.isDarwin then '' + jamenv = '' + unset AR + '' + (if stdenv.isDarwin then '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL" export GARGLKINI="$out/Applications/Gargoyle.app/Contents/Resources/garglk.ini" '' else '' @@ -12,21 +14,21 @@ let export _APPDIR=libexec/gargoyle export _LIBDIR=libexec/gargoyle export GARGLKINI="$out/etc/garglk.ini" - ''; + ''); in stdenv.mkDerivation { - name = "gargoyle-2017-03-12"; + name = "gargoyle-2017-05-17"; src = fetchFromGitHub { owner = "garglk"; repo = "garglk"; - rev = "7d8fe875927c332ea30d75656bc982354b42f602"; - sha256 = "00nac7j84gfql1cr11cs9ad4j1gsxrnkqfx6mis4ijf7d6px3sih"; + rev = "2da2824748b0b99107f481801f818efc54a43d3a"; + sha256 = "184lgylcbhj205pfccwgl7avs0pczwrc53nvkzhj2p5inxak20kk"; }; - nativeBuildInputs = [ jam pkgconfig ]; + nativeBuildInputs = [ jam pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin libtool; buildInputs = [ gtk2 SDL SDL_mixer ] ++ ( if stdenv.isDarwin then [ smpeg libvorbis ] else [ SDL_sound ] |