Merge remote-tracking branch 'upstream/staging' into deps-reorg

This commit is contained in:
John Ericson
2017-09-28 12:32:57 -04:00
789 changed files with 15725 additions and 8096 deletions
@@ -1,19 +1,19 @@
{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre
, SDL_image, freetype, glew, mesa, boost, glm
{ stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre
, SDL2_image, freetype, glew, mesa, boost, glm
}:
stdenv.mkDerivation rec {
version = "0.44";
version = "0.47";
name = "gource-${version}";
src = fetchurl {
url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz";
sha256 = "0z095zsf5pz8czh7nmlkdy29rm93w83sqyqspg2zsprh892cl116";
sha256 = "1llqwdnfa1pff8bxk27qsqff1fcg0a9kfdib0rn7p28vl21n1cgj";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
glew SDL ftgl libpng libjpeg pcre SDL_image mesa
glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa
boost glm freetype
];