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

cairo: pull an upstream patch to fix racket

Browse Source 
Close #5165, #5166.
Also enableParallelBuilding in racket.
This commit is contained in:
Vladimír Čunát 2014-11-28 20:26:22 +01:00
parent cbd2305d4d
commit e75fe2e528
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/interpreters/racket/default.nix
View File

@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ]; configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ];
NIX_LDFLAGS = "-lgcc_s"; NIX_LDFLAGS = "-lgcc_s";
enableParallelBuilding = true;
postInstall = '' postInstall = ''
for p in $(ls $out/bin/) ; do for p in $(ls $out/bin/) ; do

8
pkgs/development/libraries/cairo/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libiconvOrEmpty, libintlOrEmpty { stdenv, fetchurl, fetchpatch, pkgconfig, libiconvOrEmpty, libintlOrEmpty
, expat, zlib, libpng, pixman, fontconfig, freetype, xlibs , expat, zlib, libpng, pixman, fontconfig, freetype, xlibs
, gobjectSupport ? true, glib , gobjectSupport ? true, glib
, xcbSupport ? true # no longer experimental since 1.12 , xcbSupport ? true # no longer experimental since 1.12
@ -18,6 +18,12 @@ stdenv.mkDerivation rec {
sha1 = "53cf589b983412ea7f78feee2e1ba9cea6e3ebae"; sha1 = "53cf589b983412ea7f78feee2e1ba9cea6e3ebae";
}; };
patches = [(fetchpatch {
name = "fix-racket.diff";
url = "http://cgit.freedesktop.org/cairo/patch/?id=2de69581c28bf115852037ca41eba13cb7335976";
sha256 = "0mk2fd9fwxqzravlmnbbrzwak15wqspn7609y0yn6qh87va5i0x4";
})];
nativeBuildInputs = [ pkgconfig ] ++ libintlOrEmpty ++ libiconvOrEmpty; nativeBuildInputs = [ pkgconfig ] ++ libintlOrEmpty ++ libiconvOrEmpty;
propagatedBuildInputs = propagatedBuildInputs =