Merge remote-tracking branch 'upstream/master' into hardened-stdenv

4 files changed, 33 insertions, 8 deletions

diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix
index 1a14aae626363..ada58e87fd0a0 100644
--- a/pkgs/tools/cd-dvd/bashburn/default.nix
+++ b/pkgs/tools/cd-dvd/bashburn/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "bash script CD Burner Writer";
+    description = "Bash script CD Burner Writer";
     longDescription = ''
       It might not be the best looking application out there, but it works.
       It’s simple, fast and small, and can handle most things you throw at it.
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index e903601c81dda..d033371cbcd64 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify
 , libcanberra_gtk3, intltool, makeWrapper, dvdauthor, libburn, libisofs
-, vcdimager, wrapGAppsHook }:
+, vcdimager, wrapGAppsHook, hicolor_icon_theme }:
 
 # libdvdcss is "too old" (in fast "too new"), see https://bugs.launchpad.net/ubuntu/+source/brasero/+bug/611590
 
@@ -21,6 +21,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];
 
   buildInputs = [ gtk3 libxml2 libnotify libcanberra_gtk3 libburn libisofs
+                  hicolor_icon_theme
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
                   gst_all_1.gst-plugins-ugly gst_all_1.gst-libav ];
diff --git a/pkgs/tools/cd-dvd/uif2iso/default.nix b/pkgs/tools/cd-dvd/uif2iso/default.nix
new file mode 100644
index 0000000000000..4e3a2daafe81d
--- /dev/null
+++ b/pkgs/tools/cd-dvd/uif2iso/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, unzip, zlib }:
+
+stdenv.mkDerivation rec {
+  nameNoVer = "uif2iso";
+  name = "${nameNoVer}-0.1.7";
+
+  src = fetchurl {
+    url = "http://aluigi.altervista.org/mytoolz/${nameNoVer}.zip";
+    sha256 = "1v18fmlzhkkhv8xdc9dyvl8vamwg3ka4dsrg7vvmk1f2iczdx3dp";
+  };
+
+  buildInputs = [unzip zlib];
+
+  installPhase = ''
+    make -C . prefix="$out" install;
+  '';
+
+  meta = {
+    description = "Tool for converting single/multi part UIF image files to ISO";
+    homepage = "http://aluigi.org/mytoolz.htm#uif2iso";
+    license = stdenv.lib.licenses.gpl1Plus;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix
index 8dd4c709b016d..730f8a90ce2d3 100644
--- a/pkgs/tools/cd-dvd/xorriso/default.nix
+++ b/pkgs/tools/cd-dvd/xorriso/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }:
 
 stdenv.mkDerivation rec {
-  name = "xorriso-1.4.2";
+  name = "xorriso-1.4.4";
 
   src = fetchurl {
     url = "mirror://gnu/xorriso/${name}.tar.gz";
-    sha256 = "1cq4a0904lnz6nygbgarnlq49cz4qnfdyvz90s3nfk5as7gbwhr8";
+    sha256 = "1izv8dvwacyh432vv1rm6lyjrq0v205kyakfra6iwa146c9m9fgr";
   };
 
   doCheck = true;
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libcdio zlib bzip2 readline attr ]
     ++ stdenv.lib.optional stdenv.isLinux acl;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "ISO 9660 Rock Ridge file system manipulator";
 
     longDescription =
@@ -26,11 +26,11 @@ stdenv.mkDerivation rec {
          filesystems.
       '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
 
     homepage = http://www.gnu.org/software/xorriso/;
 
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.vrthra ];
+    platforms = platforms.unix;
   };
 }