Unverified Commit 1bb0b1f7 authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #195118 from wegank/aegisub-wxgtk 

aegisub: migrate to wxGTK32
parents d4a13642 7d943230

pkgs/applications/video/aegisub/default.nix

+7 −1
Original line number Diff line number Diff line
@@ -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;

  };

}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 {}));