diff --git a/pkgs/by-name/ec/ecdsautils/package.nix b/pkgs/by-name/ec/ecdsautils/package.nix index ee4560b82c0a..3c90fcd5c8ba 100644 --- a/pkgs/by-name/ec/ecdsautils/package.nix +++ b/pkgs/by-name/ec/ecdsautils/package.nix @@ -1,7 +1,12 @@ { lib, stdenv, - pkgs, + fetchFromGitHub, + fetchpatch, + cmake, + pkg-config, + doxygen, + libuecc, }: let @@ -11,19 +16,26 @@ in stdenv.mkDerivation { inherit pname version; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "freifunk-gluon"; repo = "ecdsautils"; rev = "v${version}"; sha256 = "sha256-vGHLAX/XOtePvdT/rljCOdlILHVO20mCt6p+MUi13dg="; }; - nativeBuildInputs = with pkgs; [ + patches = [ + (fetchpatch { + url = "https://github.com/freifunk-gluon/ecdsautils/commit/19f096f9c10264f4efe4b926fe83126e85642cba.patch"; + hash = "sha256-oJv47NckFHFONPcG3WfHwgaHRqrz2eWXzbr5SQr+kX4="; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config doxygen ]; - buildInputs = with pkgs; [ libuecc ]; + buildInputs = [ libuecc ]; meta = with lib; { description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)"; diff --git a/pkgs/by-name/le/lensfun/package.nix b/pkgs/by-name/le/lensfun/package.nix index c6d058c55b67..d59644ce0c73 100644 --- a/pkgs/by-name/le/lensfun/package.nix +++ b/pkgs/by-name/le/lensfun/package.nix @@ -45,6 +45,16 @@ stdenv.mkDerivation { mkdir -p data/db tar xvf $TMPDIR/db/version_1.tar -C data/db date +%s > data/db/timestamp.txt + '' + # Backport CMake 4 support + # This is already on master, but not yet in a stable release: + # https://github.com/lensfun/lensfun/issues/2520 + # https://github.com/lensfun/lensfun/commit/011de2e85813ff496a85404b30891352555de077 + + '' + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR )' \ + 'CMAKE_MINIMUM_REQUIRED(VERSION 3.12 FATAL_ERROR)' ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libuecc/package.nix b/pkgs/by-name/li/libuecc/package.nix index eebb0f2a01c4..becafcf39c36 100644 --- a/pkgs/by-name/li/libuecc/package.nix +++ b/pkgs/by-name/li/libuecc/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchgit, + fetchpatch, cmake, }: @@ -15,6 +16,14 @@ stdenv.mkDerivation rec { sha256 = "1sm05aql75sh13ykgsv3ns4x4zzw9lvzid6misd22gfgf6r9n5fs"; }; + patches = [ + # Backport CMake 4 support + (fetchpatch { + url = "https://github.com/neocturne/libuecc/commit/b3812bf5ab1777193c4b85863311c33997d141f9.patch"; + hash = "sha256-3h+LC5JlSXNiJlEQxSQzC7+5s+nMp+ll2NQQC5HzTf0="; + }) + ]; + nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/pkgs/by-name/sq/sqlitebrowser/package.nix b/pkgs/by-name/sq/sqlitebrowser/package.nix index 4318bc279d81..d11c3b469bd2 100644 --- a/pkgs/by-name/sq/sqlitebrowser/package.nix +++ b/pkgs/by-name/sq/sqlitebrowser/package.nix @@ -28,6 +28,13 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail '"Unknown"' '"${finalAttrs.src.rev}"' + '' + # Fix build with CMake 4 + # Will be part of the Qt6 port + # Note: The vendored version of qhexedit is incompatible with our qhexedit2: https://github.com/sqlitebrowser/sqlitebrowser/issues/1808 + + '' + substituteInPlace libs/qhexedit/CMakeLists.txt \ + --replace-fail 'cmake_minimum_required(VERSION 2.8.12.2)' 'cmake_minimum_required(VERSION 3.16)' ''; buildInputs = [