diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-02-01 21:21:08 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-02-06 23:38:47 +0100 |
| commit | 5af41b7a2265cbc88c3fa128133e91e274e937e0 (patch) | |
| tree | 7d75dfa029f778b2120514d0c7adbe56438bea9c /pkgs/development/libraries/pixman | |
| parent | 79f43537e6e99d6b9451d9643ae405aab29bb468 (diff) | |
| download | nixlib-5af41b7a2265cbc88c3fa128133e91e274e937e0.tar nixlib-5af41b7a2265cbc88c3fa128133e91e274e937e0.tar.gz nixlib-5af41b7a2265cbc88c3fa128133e91e274e937e0.tar.bz2 nixlib-5af41b7a2265cbc88c3fa128133e91e274e937e0.tar.lz nixlib-5af41b7a2265cbc88c3fa128133e91e274e937e0.tar.xz nixlib-5af41b7a2265cbc88c3fa128133e91e274e937e0.tar.zst nixlib-5af41b7a2265cbc88c3fa128133e91e274e937e0.zip | |
pixman: fix clang5 build
Diffstat (limited to 'pkgs/development/libraries/pixman')
| -rw-r--r-- | pkgs/development/libraries/pixman/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index dc378711d36b..6b891bdb38c2 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,16 +1,25 @@ -{ fetchurl, stdenv, pkgconfig, libpng, glib /*just passthru*/ }: +{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { - name = "pixman-0.34.0"; + name = "pixman-${version}"; + version = "0.34.0"; src = fetchurl { url = "mirror://xorg/individual/lib/${name}.tar.bz2"; sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir"; }; - patches = []; + patches = stdenv.lib.optionals stdenv.cc.isClang [ + (fetchpatch { + name = "builtin-shuffle.patch"; + url = https://patchwork.freedesktop.org/patch/177506/raw; + sha256 = "0rvraq93769dy2im2m022rz99fcdxprgc2fbmasnddcwrqy1x3xr"; + }) + ]; + + nativeBuildInputs = [ pkgconfig ] + ++ stdenv.lib.optionals stdenv.cc.isClang [ autoconf automake libtool ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = stdenv.lib.optional doCheck libpng; configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt"; |