public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into stdenv-updates

Browse Source 
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
This commit is contained in:
Vladimír Čunát
2014-01-18 14:46:20 +01:00
parent 2848336491 9c1d3bfa9f
commit 0a58b512cb
231 changed files with 2911 additions and 1982 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/gource/default.nix
+10 -10
View File
@@ -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;
};
}