Skip to content

Commit

Permalink
pixman: 0.43.4 -> 0.44.0
Browse files Browse the repository at this point in the history
  • Loading branch information
trofi committed Nov 9, 2024
1 parent d2d4c4f commit 3661feb
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions pkgs/by-name/pi/pixman/package.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, meson
, ninja
, pkg-config
Expand All @@ -24,16 +25,26 @@

stdenv.mkDerivation (finalAttrs: {
pname = "pixman";
version = "0.43.4";
version = "0.44.0";

src = fetchurl {
urls = with finalAttrs; [
"mirror://xorg/individual/lib/${pname}-${version}.tar.gz"
"https://cairographics.org/releases/${pname}-${version}.tar.gz"
];
hash = "sha256-oGJNuQGAx923n8epFRCT3DfGRtjDjT8jL3Z89kuFoiY=";
hash = "sha256-iaTB4eReCyPf/nCCAssur/3g/jcn12krLhc5/seKfaw=";
};

patches = [
# Fix rvv feature detection on gcc-13:
# https://gitlab.freedesktop.org/pixman/pixman/-/merge_requests/128
(fetchpatch {
name = "gcc-13-rvv-detect.patch";
url = "https://gitlab.freedesktop.org/pixman/pixman/-/commit/da6350001fdba00f77ca8b590171c943cb425ec4.patch";
hash = "sha256-HKBvVqySFY+c3WA8hc/OUkev04VQ38D9r1yYAKCe+84=";
})
];

# Raise test timeout, 120s can be slightly exceeded on slower hardware
postPatch = ''
substituteInPlace test/meson.build \
Expand All @@ -50,11 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
# architectures and requires used to disable them:
# https://gitlab.freedesktop.org/pixman/pixman/-/issues/88
mesonAutoFeatures = "auto";
mesonFlags = [
"-Diwmmxt=disabled"
]
# Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved
++ lib.optional (stdenv.hostPlatform.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled";

preConfigure = ''
# https://gitlab.freedesktop.org/pixman/pixman/-/issues/62
Expand Down

0 comments on commit 3661feb

Please sign in to comment.