summary refs log tree commit diff
diff options
context:
space:
mode:
authorRenaud <c0bw3b@users.noreply.github.com>2022-02-08 20:43:34 +0100
committerc0bw3b <c0bw3b@users.noreply.github.com>2022-02-10 12:01:48 +0100
commit096234961d0cf944767d4608e66f3af158571065 (patch)
treec864691dd74ae0e890d329ba3449a2a3f3663a44
parenta6e9d993b995ca9244cc369200677be132cb56ef (diff)
downloadnixpkgs-096234961d0cf944767d4608e66f3af158571065.tar
nixpkgs-096234961d0cf944767d4608e66f3af158571065.tar.gz
nixpkgs-096234961d0cf944767d4608e66f3af158571065.tar.bz2
nixpkgs-096234961d0cf944767d4608e66f3af158571065.tar.lz
nixpkgs-096234961d0cf944767d4608e66f3af158571065.tar.xz
nixpkgs-096234961d0cf944767d4608e66f3af158571065.tar.zst
nixpkgs-096234961d0cf944767d4608e66f3af158571065.zip
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
-rw-r--r--pkgs/applications/video/dvdstyler/default.nix45
1 files changed, 28 insertions, 17 deletions
diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
index 81f3cac73e1..8d42c2b2bfd 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/";