From c4ed73fabd7f8bb2822afc50fe9fc2deea724464 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 16 Aug 2022 03:01:40 -0700 Subject: [PATCH 1/2] qt4: Remove overzealous and obsolete patch. This patch is replaced by gcc11-ptr-cmp.patch, which works on both clang and gcc. --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index e581bdf5f88e..2ff8644e32e4 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -50,9 +50,6 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.cc.isClang '' substituteInPlace src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp \ --replace 'optionalHeight > 0' 'optionalHeight != NULL' - - substituteInPlace ./tools/linguist/linguist/messagemodel.cpp \ - --replace 'm->comment()) >= 0' 'm->comment()) != NULL' ''; patches = From 0bab8f164ca3efd360299065e9d75a27304798de Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 16 Aug 2022 03:09:24 -0700 Subject: [PATCH 2/2] qt4: add aarch64-darwin to list of bad platforms I am not sure how to make Qt4 work on aarch64-darwin. It appears to be nontrivial, and I didn't find patches anywhere. --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 2ff8644e32e4..816b75039612 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -234,6 +234,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; # or gpl3 maintainers = with lib.maintainers; [ orivej lovek323 sander ]; platforms = lib.platforms.unix; - badPlatforms = [ "x86_64-darwin" ]; + badPlatforms = [ "x86_64-darwin" "aarch64-darwin" ]; }; }