JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #195118 from wegank/aegisub-wxgtk

Browse Source 
aegisub: migrate to wxGTK32
This commit is contained in:
Anderson Torres 2022-10-08 18:41:03 -03:00 committed by GitHub
commit 1bb0b1f739
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/video/aegisub/default.nix
View File

@ -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;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -1142,7 +1142,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 {}));