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

Merge pull request #13579 from vbgl/pixman-darwin 

pixman: remove legacy patches
This commit is contained in:
Domen Kožar 2016-02-29 20:13:35 +00:00
parent 5f8311775c b1801168e3
commit 03d1e0fb8f
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir"; sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir";
}; };
patches = stdenv.lib.optional stdenv.isDarwin ./fix-clang36.patch; patches = [];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = stdenv.lib.optional doCheck libpng; buildInputs = stdenv.lib.optional doCheck libpng;

11
pkgs/development/libraries/pixman/fix-clang36.patch
View File

@ -1,11 +0,0 @@
--- a/pixman/pixman-mmx.c 2014-04-24 08:34:14.000000000 +0400
+++ b/pixman/pixman-mmx.c 2015-01-30 20:19:28.000000000 +0300
@@ -89,7 +89,7 @@
return __A;
}
-# ifdef __OPTIMIZE__
+# if defined(__OPTIMIZE__) && !(defined (__clang__) && defined(__clang_major__) && defined(__clang_minor__) && __clang_major__ == 3 && __clang_minor__ >= 6)
extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
_mm_shuffle_pi16 (__m64 __A, int8_t const __N)
{