diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:35:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:46:20 +0100 |
| commit | 0a58b512cb696b2482cbac4fd3a20b43ae31c1bc (patch) | |
| tree | 7ae35a255ac57b66696c3db743f6ed9a4dab7431 /pkgs/applications/version-management/gource | |
| parent | 284833649192072959a335367374fc0a6ec667df (diff) | |
| parent | 9c1d3bfa9f7d7b95eb20d0f729e3b3c9d7abcd4b (diff) | |
| download | nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.gz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.bz2 nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.lz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.xz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.zst nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.zip | |
Merge master into stdenv-updates
Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/version-management/gource')
| -rw-r--r-- | pkgs/applications/version-management/gource/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 1bbc595d0404..1dab01c09fcb 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL_image, glew, mesa }: +{ stdenv, fetchurl, SDL, ftgl, pkgconfig, libpng, libjpeg, pcre +, SDL_image, glew, mesa, boostHeaders +}: -let - name = "gource-0.37"; -in -stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + name = "gource-0.40"; src = fetchurl { url = "http://gource.googlecode.com/files/${name}.tar.gz"; - sha256 = "03kd9nn65cl1p2jgn6pvpxmvnfscz3c8jqds90fsc0z37ij2iiyn"; + sha256 = "04nirh07xjslqsph557as4s50nlf91bi6v2l7vmbifmkdf90m2cw"; }; - buildInputs = [glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa]; + buildInputs = [ + glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boostHeaders + ]; NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions @@ -31,7 +32,6 @@ stdenv.mkDerivation { by several third party tools for CVS repositories. ''; - platforms = stdenv.lib.platforms.gnu; - maintainers = [ stdenv.lib.maintainers.simons ]; + broken = true; }; } |