From 2b56137231a8e16f6cd27b97ef8e4d9edda51ee2 Mon Sep 17 00:00:00 2001 From: Jason Odoom Date: Fri, 20 Feb 2026 01:21:08 -0500 Subject: [PATCH] libjxl: 0.11.1 -> 0.11.2 https://github.com/libjxl/libjxl/releases/tag/v0.11.2 Fixes: CVE-2025-12474 --- pkgs/by-name/li/libjxl/package.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix index baafab3033bf..040b1d7a0bef 100644 --- a/pkgs/by-name/li/libjxl/package.nix +++ b/pkgs/by-name/li/libjxl/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, brotli, cmake, ctestCheckHook, @@ -32,7 +31,7 @@ in stdenv.mkDerivation rec { pname = "libjxl"; - version = "0.11.1"; + version = "0.11.2"; outputs = [ "out" @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { owner = "libjxl"; repo = "libjxl"; tag = "v${version}"; - hash = "sha256-ORwhKOp5Nog366UkLbuWpjz/6sJhxUO6+SkoJGH+3fE="; + hash = "sha256-L4/BY68ZBCpebQxryR7D1CxrsneYvw8B8EvW2mkF7bA="; # There are various submodules in `third_party/`. fetchSubmodules = true; }; @@ -145,17 +144,6 @@ stdenv.mkDerivation rec { rm -rf third_party/!(sjpeg)/ shopt -u extglob - # Fix the build with CMake 4. - # - # See: - # - # * - # * - substituteInPlace third_party/sjpeg/CMakeLists.txt \ - --replace-fail \ - 'cmake_minimum_required(VERSION 2.8.7)' \ - 'cmake_minimum_required(VERSION 3.5...3.10)' - substituteInPlace plugins/gdk-pixbuf/jxl.thumbnailer \ --replace '/usr/bin/gdk-pixbuf-thumbnailer' "$out/libexec/gdk-pixbuf-thumbnailer-jxl" substituteInPlace CMakeLists.txt \