diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-28 20:26:22 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-28 20:28:47 +0100 |
| commit | e75fe2e528d745610eb4924e418aee0d85cc582f (patch) | |
| tree | 2b321471eb9c2bd9ba2300aeef728a04410939bf /pkgs/development/libraries/cairo | |
| parent | cbd2305d4dad93142e4fa17ca7935c6d215d981f (diff) | |
| download | nixpkgs-e75fe2e528d745610eb4924e418aee0d85cc582f.tar nixpkgs-e75fe2e528d745610eb4924e418aee0d85cc582f.tar.gz nixpkgs-e75fe2e528d745610eb4924e418aee0d85cc582f.tar.bz2 nixpkgs-e75fe2e528d745610eb4924e418aee0d85cc582f.tar.lz nixpkgs-e75fe2e528d745610eb4924e418aee0d85cc582f.tar.xz nixpkgs-e75fe2e528d745610eb4924e418aee0d85cc582f.tar.zst nixpkgs-e75fe2e528d745610eb4924e418aee0d85cc582f.zip | |
cairo: pull an upstream patch to fix racket
Close #5165, #5166. Also enableParallelBuilding in racket.
Diffstat (limited to 'pkgs/development/libraries/cairo')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index dd73858c3fc..97e455b1f30 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libiconvOrEmpty, libintlOrEmpty +{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconvOrEmpty, libintlOrEmpty , expat, zlib, libpng, pixman, fontconfig, freetype, xlibs , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { sha1 = "53cf589b983412ea7f78feee2e1ba9cea6e3ebae"; }; + patches = [(fetchpatch { + name = "fix-racket.diff"; + url = "http://cgit.freedesktop.org/cairo/patch/?id=2de69581c28bf115852037ca41eba13cb7335976"; + sha256 = "0mk2fd9fwxqzravlmnbbrzwak15wqspn7609y0yn6qh87va5i0x4"; + })]; + nativeBuildInputs = [ pkgconfig ] ++ libintlOrEmpty ++ libiconvOrEmpty; propagatedBuildInputs = |