diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-14 06:01:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-14 06:01:02 +0000 |
| commit | f656c3e849f4eb1471aacf38607d7ed1ff9888e2 (patch) | |
| tree | 4b03345df9ed2adcdda9dd04f758c3dff4ae5c0d /pkgs/applications/video | |
| parent | 2b78639484d824eb61aaaeb9999f250e75247921 (diff) | |
| parent | 406d96ff15a1c7025f4bb7ceb514818e9b7acea9 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/dvdstyler/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/applications/video/dvdstyler/wxgtk32.patch | 12 |
2 files changed, 21 insertions, 4 deletions
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index cd36914583364..ba0d4945385e6 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -17,7 +17,7 @@ , libjpeg , pkg-config , wrapGAppsHook -, wxGTK30 # crash with wxGTK30 with GTK2 compat +, wxGTK32 , wxSVG , xine-ui , xmlto @@ -33,13 +33,18 @@ let inherit (lib) optionals makeBinPath; in stdenv.mkDerivation rec { pname = "dvdstyler"; - version = "3.1.2"; + version = "3.2.1"; src = fetchurl { url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/DVDStyler-${version}.tar.bz2"; - sha256 = "03lsblqficcadlzkbyk8agh5rqcfz6y6dqvy9y866wqng3163zq4"; + sha256 = "sha256-C7M0hzn0yTCXRUuBTss6WPa6zo8DD0Fhmp/ur7R0dVg="; }; + patches = [ + # https://sourceforge.net/p/dvdstyler/DVDStyler/ci/679fa8dc6ac7657775eda9d7b0ed9da9d069aeec/ + ./wxgtk32.patch + ]; + nativeBuildInputs = [ bison docbook_xml_dtd_412 @@ -62,7 +67,7 @@ in stdenv.mkDerivation rec { libexif libjpeg wxSVG - wxGTK30 + wxGTK32 xine-ui ] ++ optionals dvdisasterSupport [ dvdisaster ] diff --git a/pkgs/applications/video/dvdstyler/wxgtk32.patch b/pkgs/applications/video/dvdstyler/wxgtk32.patch new file mode 100644 index 0000000000000..92b3c3fbe3ba7 --- /dev/null +++ b/pkgs/applications/video/dvdstyler/wxgtk32.patch @@ -0,0 +1,12 @@ +--- a/wxVillaLib/PropDlg.cpp ++++ b/wxVillaLib/PropDlg.cpp +@@ -12,7 +12,9 @@ + #include "utils.h" + #include <wx/fontdlg.h> + #include <wx/colordlg.h> ++#ifdef __WXMSW__ + #include <wx/generic/colrdlgg.h> ++#endif + #include <wx/filedlg.h> + #include <wx/dirdlg.h> + #include <wx/grid.h> |