about summary refs log tree commit diff
path: root/pkgs/applications/backup
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2014-12-18 10:12:37 +0100
committerDomen Kožar <domen@dev.si>2014-12-18 10:12:47 +0100
commit972868c7e160764541090f4b115414823c80b110 (patch)
tree7b1b75056b4e6de4377a9d70b1e02d825d161f8d /pkgs/applications/backup
parent3cb1ce8577091e46d3c70e0973b9cdd6029bb183 (diff)
downloadnixlib-972868c7e160764541090f4b115414823c80b110.tar
nixlib-972868c7e160764541090f4b115414823c80b110.tar.gz
nixlib-972868c7e160764541090f4b115414823c80b110.tar.bz2
nixlib-972868c7e160764541090f4b115414823c80b110.tar.lz
nixlib-972868c7e160764541090f4b115414823c80b110.tar.xz
nixlib-972868c7e160764541090f4b115414823c80b110.tar.zst
nixlib-972868c7e160764541090f4b115414823c80b110.zip
crashplan: fix CrashPlanDesktop binary
(cherry picked from commit 0d4acad489cd2962908eb157551519c79d5b1182)
Signed-off-by: Domen Kožar <domen@dev.si>
Diffstat (limited to 'pkgs/applications/backup')
-rw-r--r--pkgs/applications/backup/crashplan/CrashPlanDesktop.patch8
-rw-r--r--pkgs/applications/backup/crashplan/default.nix4
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch b/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
new file mode 100644
index 000000000000..005164848905
--- /dev/null
+++ b/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch
@@ -0,0 +1,8 @@
+--- ./scripts/CrashPlanDesktop    2014-12-18 09:51:14.050804325 +0100
++++ ./scripts/CrashPlanDesktop-1  2014-12-18 09:51:32.271009382 +0100
+@@ -9,4 +9,4 @@
+ 
+ cd ${TARGETDIR}
+ 
+-${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log &
++${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop &
diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index 1a78dea21578..126bd3c1fd58 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
     description = "An online/offline backup solution";
     homepage = "http://www.crashplan.org";
     license = licenses.unfree;
-    maintainers = with maintainers; [ sztupi ];
+    maintainers = with maintainers; [ sztupi iElectric ];
   };
 
   buildInputs = [ makeWrapper cpio ];
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
 
   manifestdir = "${vardir}/manifest";
 
-  patches = [ ./CrashPlanEngine.patch ];
+  patches = [ ./CrashPlanEngine.patch ./CrashPlanDesktop.patch ];
 
   installPhase = ''
     mkdir $out