dvdstyler: xineUI -> xine-ui

pkgs/applications/video/dvdstyler/default.nix

@@ -1,51 +1,74 @@
-{ lib, stdenv, fetchurl, pkg-config
-, flex, bison, gettext
-, xineUI, wxSVG
+{ lib
+, stdenv
+, fetchurl
+, bison
+, cdrtools
+, docbook5
+, dvdauthor
+, dvdplusrwtools
+, flex
 , fontconfig
-, xmlto, docbook5, zip
-, cdrtools, dvdauthor, dvdplusrwtools
+, gettext
+, makeWrapper
+, pkg-config
+, wxSVG
+, xine-ui
+, xmlto
+, zip
+
 , dvdisasterSupport ? true, dvdisaster ? null
 , thumbnailSupport ? true, libgnomeui ? null
 , udevSupport ? true, udev ? null
 , dbusSupport ? true, dbus ? null
-, makeWrapper }:
-
-with lib;
-stdenv.mkDerivation rec {
+}:
 
+let
+  inherit (lib) optionals makeBinPath;
+in stdenv.mkDerivation rec {
   pname = "dvdstyler";
-  srcName = "DVDStyler-${version}";
   version = "3.1.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2";
+    url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/DVDStyler-${version}.tar.bz2";
     sha256 = "03lsblqficcadlzkbyk8agh5rqcfz6y6dqvy9y866wqng3163zq4";
   };
 
-  nativeBuildInputs =
-  [ pkg-config ];
-
-  packagesToBinPath =
-  [ cdrtools dvdauthor dvdplusrwtools ];
-
-  buildInputs =
-  [ flex bison gettext xineUI
-    wxSVG fontconfig xmlto
-    docbook5 zip makeWrapper ]
-  ++ packagesToBinPath
+  nativeBuildInputs = [
+    pkg-config
+  ];
+  buildInputs = [
+    bison
+    cdrtools
+    docbook5
+    dvdauthor
+    dvdplusrwtools
+    flex
+    fontconfig
+    gettext
+    makeWrapper
+    wxSVG
+    xine-ui
+    xmlto
+    zip
+ ]
   ++ optionals dvdisasterSupport [ dvdisaster ]
   ++ optionals udevSupport [ udev ]
   ++ optionals dbusSupport [ dbus ]
   ++ optionals thumbnailSupport [ libgnomeui ];
 
-  binPath = makeBinPath packagesToBinPath;
 
-  postInstall = ''
-    wrapProgram $out/bin/dvdstyler \
-      --prefix PATH ":" "${binPath}"
+  postInstall = let
+    binPath = makeBinPath [
+      cdrtools
+      dvdauthor
+      dvdplusrwtools
+    ]; in
+    ''
+       wrapProgram $out/bin/dvdstyler --prefix PATH ":" "${binPath}"
     '';
 
   meta = with lib; {
+    homepage = "https://www.dvdstyler.org/";
     description = "A DVD authoring software";
     longDescription = ''
       DVDStyler is a cross-platform free DVD authoring application for the
@@ -55,6 +78,7 @@ stdenv.mkDerivation rec {
       Software and is completely free.
 
       Some of its features include:
+
       - create and burn DVD video with interactive menus
       - design your own DVD menu or select one from the list of ready to use menu
         templates
@@ -77,8 +101,7 @@ stdenv.mkDerivation rec {
       - copy any menu object or whole menu
       - customize navigation using DVD scripting
     '';
-    homepage = "http://www.dvdstyler.org/";
-    license = with licenses; gpl2;
+    license = licenses.gpl2Plus;
     maintainers = with maintainers; [ AndersonTorres ];
     platforms = with platforms; linux;
   };