diff options
Diffstat (limited to 'pkgs/tools/cd-dvd/dvdisaster')
-rw-r--r-- | pkgs/tools/cd-dvd/dvdisaster/default.nix | 27 | ||||
-rw-r--r-- | pkgs/tools/cd-dvd/dvdisaster/encryption.patch | 24 |
2 files changed, 30 insertions, 21 deletions
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 101d69c0903..7d17b8b3282 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, which, gettext, intltool +{ stdenv, fetchurl, pkgconfig, gettext, which , glib, gtk2 , enableSoftening ? true }: +let version = "0.79.5"; in stdenv.mkDerivation rec { - name = "dvdisaster-0.72.6"; + name = "dvdisaster-${version}"; src = fetchurl { url = "http://dvdisaster.net/downloads/${name}.tar.bz2"; - sha256 = "e9787dea39aeafa38b26604752561bc895083c17b588489d857ac05c58be196b"; + sha256 = "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w"; }; + nativeBuildInputs = [ gettext pkgconfig which ]; + buildInputs = [ glib gtk2 ]; + patches = stdenv.lib.optional enableSoftening [ ./encryption.patch ./dvdrom.patch @@ -21,8 +25,13 @@ stdenv.mkDerivation rec { sed -i 's/dvdisaster48.png/dvdisaster/' contrib/dvdisaster.desktop ''; - # Explicit --docdir= is required for on-line help to work: - configureFlags = [ "--docdir=$out/share/doc" ]; + configureFlags = [ + # Explicit --docdir= is required for on-line help to work: + "--docdir=$out/share/doc" + "--with-nls=yes" + "--with-embedded-src-path=no" + ] ++ stdenv.lib.optional (builtins.elem stdenv.system + stdenv.lib.platforms.x86_64) "--with-sse2=yes"; buildInputs = [ pkgconfig which gettext intltool @@ -35,11 +44,13 @@ stdenv.mkDerivation rec { for size in 16 24 32 48 64; do mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps/ - cp contrib/dvdisaster"$size".png $out/share/icons/hicolor/"$size"x"$size"/apps/dvdisaster.png + cp contrib/dvdisaster"$size".png \ + $out/share/icons/hicolor/"$size"x"$size"/apps/dvdisaster.png done ''; meta = with stdenv.lib; { + inherit version; homepage = http://dvdisaster.net/; description = "Data loss/scratch/aging protection for CD/DVD media"; longDescription = '' @@ -48,8 +59,8 @@ stdenv.mkDerivation rec { data which is used to recover unreadable sectors if the disc becomes damaged at a later time. ''; - license = licenses.gpl2; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ jgeerds ]; + maintainers = with maintainers; [ jgeerds nckx ]; }; } diff --git a/pkgs/tools/cd-dvd/dvdisaster/encryption.patch b/pkgs/tools/cd-dvd/dvdisaster/encryption.patch index a9383cb13cf..21e35889382 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/encryption.patch +++ b/pkgs/tools/cd-dvd/dvdisaster/encryption.patch @@ -1,21 +1,19 @@ Author: n/a Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption). -Index: dvdisaster/scsi-layer.c -=================================================================== ---- dvdisaster.orig/scsi-layer.c 2012-04-08 21:51:10.995588783 +0900 -+++ dvdisaster/scsi-layer.c 2012-04-08 21:51:29.259678075 +0900 -@@ -2693,11 +2693,12 @@ - return NULL; +diff -Naur dvdisaster-0.79.5.orig/scsi-layer.c dvdisaster-0.79.5/scsi-layer.c +--- dvdisaster-0.79.5.orig/scsi-layer.c 2015-10-28 21:56:57.000000000 +0100 ++++ dvdisaster-0.79.5/scsi-layer.c 2015-12-27 06:19:32.012253661 +0100 +@@ -2712,12 +2712,6 @@ } } -- -+/* - if(dh->mainType == DVD && query_copyright(dh)) - { CloseDevice(dh); - Stop(_("This software does not support encrypted media.\n")); - } -+*/ +- if(dh->mainType == DVD && query_copyright(dh)) +- { CloseImage(image); +- Stop(_("This software does not support encrypted media.\n")); +- return NULL; +- } +- /* Create the bitmap of simulated defects */ + if(Closure->simulateDefects) |