dvdstyler: 3.1.2 -> 3.2.1
This commit is contained in:
parent
0792676d67
commit
ac8f963d07
|
@ -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 ]
|
||||
|
|
12
pkgs/applications/video/dvdstyler/wxgtk32.patch
Normal file
12
pkgs/applications/video/dvdstyler/wxgtk32.patch
Normal file
|
@ -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>
|
|
@ -23392,7 +23392,7 @@ with pkgs;
|
|||
};
|
||||
|
||||
wxSVG = callPackage ../development/libraries/wxSVG {
|
||||
wxGTK = wxGTK30;
|
||||
wxGTK = wxGTK32;
|
||||
};
|
||||
|
||||
wtk = callPackage ../development/libraries/wtk { };
|
||||
|
|
Loading…
Reference in a new issue