diff options
Diffstat (limited to 'pkgs/development/libraries/pixman')
| -rw-r--r-- | pkgs/development/libraries/pixman/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/pixman/fix-clang36.patch | 11 |
2 files changed, 3 insertions, 14 deletions
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 30cceb59c00a..dc378711d36b 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, pkgconfig, libpng, glib /*just passthru*/ }: stdenv.mkDerivation rec { - name = "pixman-0.32.8"; + name = "pixman-0.34.0"; src = fetchurl { url = "mirror://xorg/individual/lib/${name}.tar.bz2"; - sha1 = "5c57045622265b877c9bf02d531973eadf942140"; + sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir"; }; - patches = stdenv.lib.optional stdenv.isDarwin ./fix-clang36.patch; + patches = []; nativeBuildInputs = [ pkgconfig ]; buildInputs = stdenv.lib.optional doCheck libpng; diff --git a/pkgs/development/libraries/pixman/fix-clang36.patch b/pkgs/development/libraries/pixman/fix-clang36.patch deleted file mode 100644 index 7db3c7ecaba3..000000000000 --- a/pkgs/development/libraries/pixman/fix-clang36.patch +++ /dev/null @@ -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) - { |