From 096234961d0cf944767d4608e66f3af158571065 Mon Sep 17 00:00:00 2001 From: Renaud Date: Tue, 8 Feb 2022 20:43:34 +0100 Subject: [PATCH] dvdstyler: unbreak and refactor * needs wxGTK30 with GTK3 only to avoid crashing on startup * needs GApps wrapping to avoid crashing under some menus * libjpeg was missing in the dependencies * move some deps to nativeBuildInputs because they are not used at runtime --- pkgs/applications/video/dvdstyler/default.nix | 45 ++++++++++++------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 81f3cac73e19..8d42c2b2bfd6 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -3,17 +3,21 @@ , fetchurl , bison , cdrtools -, docbook5 +, docbook_xml_dtd_412 +, docbook-xsl-nons , dvdauthor , dvdplusrwtools , ffmpeg , flex , fontconfig , gettext +, glib +, gobject-introspection , libexif -, makeWrapper +, libjpeg , pkg-config -, wxGTK30 +, wrapGAppsHook +, wxGTK30-gtk3 # crash with wxGTK30 with GTK2 compat , wxSVG , xine-ui , xmlto @@ -37,43 +41,50 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ + bison + docbook_xml_dtd_412 + docbook-xsl-nons + flex + gettext + gobject-introspection pkg-config + wrapGAppsHook + xmlto + zip ]; buildInputs = [ - bison cdrtools - docbook5 dvdauthor dvdplusrwtools ffmpeg - flex fontconfig - gettext + glib libexif - makeWrapper + libjpeg wxSVG - wxGTK30 + wxGTK30-gtk3 xine-ui - xmlto - zip ] ++ optionals dvdisasterSupport [ dvdisaster ] ++ optionals udevSupport [ udev ] ++ optionals dbusSupport [ dbus ] ++ optionals thumbnailSupport [ libgnomeui ]; + enableParallelBuilding = true; - postInstall = let - binPath = makeBinPath [ + preFixup = let + binPath = makeBinPath ([ cdrtools dvdauthor dvdplusrwtools - ]; in + ] ++ optionals dvdisasterSupport [ dvdisaster ]); + in '' - wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}" - ''; + gappsWrapperArgs+=( + --prefix PATH : "${binPath}" + ) + ''; - enableParallelBuilding = true; meta = with lib; { homepage = "https://www.dvdstyler.org/";