mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-18 00:49:52 +00:00
Merge pull request #50971 from dtzWill/update/pixman-0.36.0
pixman: 0.34.0 -> 0.36.0
This commit is contained in:
commit
42213e4962
|
@ -1,24 +1,15 @@
|
||||||
{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, autoreconfHook, pkgconfig, libpng, glib /*just passthru*/ }:
|
{ stdenv, fetchurl, fetchpatch, pkgconfig, libpng, glib /*just passthru*/ }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "pixman-${version}";
|
name = "pixman-${version}";
|
||||||
version = "0.34.0";
|
version = "0.36.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://xorg/individual/lib/${name}.tar.bz2";
|
url = "mirror://xorg/individual/lib/${name}.tar.bz2";
|
||||||
sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir";
|
sha256 = "1p40fygy9lcn6ypkzh14azksi570brcpr3979bjpff8qk76c14px";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = stdenv.lib.optionals stdenv.cc.isClang [
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
(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 autoreconfHook ];
|
|
||||||
|
|
||||||
buildInputs = [ libpng ];
|
buildInputs = [ libpng ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue