diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/pixman/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/pixman/default.nix | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/pixman/default.nix b/nixpkgs/pkgs/development/libraries/pixman/default.nix index 76ec2244c833..1b5aaaaa06d4 100644 --- a/nixpkgs/pkgs/development/libraries/pixman/default.nix +++ b/nixpkgs/pkgs/development/libraries/pixman/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchurl +, meson +, ninja , pkg-config , libpng , glib /*just passthru*/ @@ -12,41 +14,57 @@ , tigervnc , wlroots , xwayland + +, gitUpdater }: stdenv.mkDerivation rec { pname = "pixman"; - version = "0.42.2"; + version = "0.43.2"; 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-6nkpflQY+1KNBGbotbkdG+iIV/o3BvSXd7KSWnKumSQ="; }; 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 export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 184 ? 184 : NIX_BUILD_CORES)) ''; + enableParallelBuilding = true; + doCheck = true; 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; { |