dvdstyler: xineUI -> xine-ui

1 files changed, 79 insertions, 56 deletions

diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
index 6366a222722f..83c38b933dd4 100644
--- a/pkgs/applications/video/dvdstyler/default.nix
+++ b/pkgs/applications/video/dvdstyler/default.nix
@@ -1,84 +1,107 @@
-{ 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
-    creation of professional-looking DVDs. It allows not only burning of video
-    files on DVD that can be played practically on any standalone DVD player,
-    but also creation of individually designed DVD menus. It is Open Source
-    Software and is completely free.
+      DVDStyler is a cross-platform free DVD authoring application for the
+      creation of professional-looking DVDs. It allows not only burning of video
+      files on DVD that can be played practically on any standalone DVD player,
+      but also creation of individually designed DVD menus. It is Open Source
+      Software and is completely free.
+
+      Some of its features include:
 
-    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
-    - create photo slideshow
-    - add multiple subtitle and audio tracks
-    - support of AVI, MOV, MP4, MPEG, OGG, WMV and other file formats
-    - support of MPEG-2, MPEG-4, DivX, Xvid, MP2, MP3, AC-3 and other audio and
-      video formats
-    - support of multi-core processor
-    - use MPEG and VOB files without reencoding
-    - put files with different audio/video format on one DVD (support of
-      titleset)
-    - user-friendly interface with support of drag & drop
-    - flexible menu creation on the basis of scalable vector graphic
-    - import of image file for background
-    - place buttons, text, images and other graphic objects anywhere on the menu
-      screen
-    - change the font/color and other parameters of buttons and graphic objects
-    - scale any button or graphic object
-    - copy any menu object or whole menu
-    - customize navigation using DVD scripting
+      - 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
+      - create photo slideshow
+      - add multiple subtitle and audio tracks
+      - support of AVI, MOV, MP4, MPEG, OGG, WMV and other file formats
+      - support of MPEG-2, MPEG-4, DivX, Xvid, MP2, MP3, AC-3 and other audio and
+        video formats
+      - support of multi-core processor
+      - use MPEG and VOB files without reencoding
+      - put files with different audio/video format on one DVD (support of
+        titleset)
+      - user-friendly interface with support of drag & drop
+      - flexible menu creation on the basis of scalable vector graphic
+      - import of image file for background
+      - place buttons, text, images and other graphic objects anywhere on the menu
+        screen
+      - change the font/color and other parameters of buttons and graphic objects
+      - scale any button or graphic object
+      - 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;
   };