diff options
author | Vladimír Čunát <v@cunat.cz> | 2024-01-18 08:00:49 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2024-01-18 08:00:49 +0100 |
commit | 3c0ab5c239270e758d232f82a0f00d48ff5647b2 (patch) | |
tree | fbf1c55ba7f4f7390d2935d828d861ebf8951254 | |
parent | 6121ba4db52d5d582bcd9bb7609349d69220f74d (diff) | |
parent | 8ad3e398b7270d7f36814bff1b72fdefca171fc8 (diff) |
Merge #279141: pixman: 0.42.2 -> 0.43.0
...into staging
-rw-r--r-- | pkgs/development/libraries/pixman/default.nix | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 8bc8934d95611..121bb03f4caca 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchurl +, meson +, ninja , pkg-config , libpng , glib /*just passthru*/ @@ -12,29 +14,37 @@ , tigervnc , wlroots , xwayland + +, gitUpdater }: stdenv.mkDerivation rec { pname = "pixman"; - version = "0.42.2"; + version = "0.43.0"; src = fetchurl { urls = [ "mirror://xorg/individual/lib/${pname}-${version}.tar.gz" "https://cairographics.org/releases/${pname}-${version}.tar.gz" ]; - hash = "sha256-6hSA762i/ZSLx1Nm98NJ4cltMpfQmj/mJibjjiNKYl4="; + hash = "sha256-plwoIJhY+xa+5Q2AnID5Co5BXA5P2DIQeKGCJ4WlVgo="; }; separateDebugInfo = !stdenv.hostPlatform.isStatic; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libpng ]; - configureFlags = lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt" - # Disable until https://gitlab.freedesktop.org/pixman/pixman/-/issues/46 is resolved - ++ lib.optional (stdenv.isAarch64 && !stdenv.cc.isGNU) "--disable-arm-a64-neon"; + # Default "enabled" value attempts to enable CPU features on all + # 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.isAarch64 && !stdenv.cc.isGNU) "-Da64-neon=disabled"; preConfigure = '' # https://gitlab.freedesktop.org/pixman/pixman/-/issues/62 @@ -47,8 +57,14 @@ stdenv.mkDerivation rec { postInstall = glib.flattenInclude; - passthru.tests = { - inherit cairo qemu scribus tigervnc wlroots xwayland; + passthru = { + tests = { + inherit cairo qemu scribus tigervnc wlroots xwayland; + }; + updateScript = gitUpdater { + url = "https://gitlab.freedesktop.org/pixman/pixman.git"; + rev-prefix = "pixman-"; + }; }; meta = with lib; { |