From 7d94323083a759d2fe84eb9aadd491b6a6516d84 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 8 Oct 2022 21:06:10 +0200 Subject: [PATCH] aegisub: migrate to wxGTK32 --- pkgs/applications/video/aegisub/default.nix | 8 +++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index f83cbf69edb1..e77fe067670f 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -130,6 +130,12 @@ stdenv.mkDerivation rec { ./remove-bundled-luajit.patch ]; + # error: unknown type name 'NSUInteger' + postPatch = '' + substituteInPlace src/dialog_colorpicker.cpp \ + --replace "NSUInteger" "size_t" + ''; + NIX_CFLAGS_COMPILE = "-I${luajit52}/include"; NIX_CFLAGS_LINK = "-L${luajit52}/lib"; @@ -153,7 +159,7 @@ stdenv.mkDerivation rec { # The Aegisub sources are itself BSD/ISC, but they are linked against GPL'd # softwares - so the resulting program will be GPL license = licenses.bsd3; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres wegank ]; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cfdc1f70e02..6b73f0390039 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1140,7 +1140,7 @@ with pkgs; aefs = callPackage ../tools/filesystems/aefs { }; aegisub = callPackage ../applications/video/aegisub ({ - wxGTK = wxGTK31; + wxGTK = wxGTK32; inherit (darwin.apple_sdk.frameworks) CoreText CoreFoundation AppKit Carbon IOKit Cocoa; } // (config.aegisub or {}));