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

pixman: fix clang5 build

Browse Source
This commit is contained in:
Daiderd Jordan 2018-02-01 21:21:08 +01:00
parent 79f43537e6
commit 5af41b7a22
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/pixman/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "pixman-0.34.0"; name = "pixman-${version}";
version = "0.34.0";
src = fetchurl { src = fetchurl {
url = "mirror://xorg/individual/lib/${name}.tar.bz2"; url = "mirror://xorg/individual/lib/${name}.tar.bz2";
sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir"; 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; buildInputs = stdenv.lib.optional doCheck libpng;
configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt"; configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt";