diff options
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/backup/areca/default.nix | 49 | ||||
-rw-r--r-- | pkgs/applications/backup/areca/fix-javah-bug.diff | 24 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 |
3 files changed, 75 insertions, 2 deletions
diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix new file mode 100644 index 000000000000..364e13e97a90 --- /dev/null +++ b/pkgs/applications/backup/areca/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, ant, jre, jdk, swt, acl, attr }: + +stdenv.mkDerivation rec { + name = "areca-7.5"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/areca/areca-stable/areca-7.5/areca-7.5-src.tar.gz"; + sha256 = "1q4ha9s96c1syplxm04bh1v1gvjq16l4pa8w25w95d2ywwvyq1xb"; + }; + + sourceRoot = "."; + + buildInputs = [ jdk ant acl attr ]; + + patches = [ ./fix-javah-bug.diff ]; + + postPatch = '' + substituteInPlace build.xml --replace "/usr/lib/java/swt.jar" "${swt}/jars/swt.jar" + substituteInPlace build.xml --replace "gcc" "${stdenv.cc}/bin/gcc" + substituteInPlace areca.sh --replace "bin/" "" + substituteInPlace bin/areca_run.sh --replace "/usr/java" "${jre}/lib/openjdk" + substituteInPlace bin/areca_run.sh --replace "/usr/lib/java/swt.jar" "${swt}/jars/swt.jar" + + sed -i "s#^PROGRAM_DIR.*#PROGRAM_DIR=$out#g" bin/areca_run.sh + sed -i "s#^LIBRARY_PATH.*#LIBRARY_PATH=${swt}/lib:$out/lib:${acl}/lib#g" bin/areca_run.sh + + # https://sourceforge.net/p/areca/bugs/563/ + substituteInPlace bin/areca_run.sh --replace '[ "$JAVA_IMPL" = "java" ]' \ + '[[ "$JAVA_IMPL" = "java" || "$JAVA_IMPL" = "openjdk" ]]' + ''; + + buildPhase = "ant"; + + installPhase = '' + mkdir -p $out/bin $out/lib $out/translations + cp areca.sh $out/bin/areca + cp -r bin $out + cp -r lib $out + cp -r translations $out + cp COPYING $out + ''; + + meta = with stdenv.lib; { + homepage = http://www.areca-backup.org/; + description = "An Open Source personal backup solution"; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/applications/backup/areca/fix-javah-bug.diff b/pkgs/applications/backup/areca/fix-javah-bug.diff new file mode 100644 index 000000000000..5d5feaf9b943 --- /dev/null +++ b/pkgs/applications/backup/areca/fix-javah-bug.diff @@ -0,0 +1,24 @@ +diff --git a/build.xml b/build.xml +index 1ba08e0..9248b76 100644 +--- a/build.xml ++++ b/build.xml +@@ -56,10 +56,16 @@ + + <target name="compilejni" unless="isWindows"> + <description>JNI compilation task (builds libarecafs.so ... for unix-like operating systems only)</description> ++ + <!--Generate the JNI header--> +- <javah destdir="${root}/jni" force="yes" classpath="${root}/lib/areca.jar"> +- <class name="com.myJava.file.metadata.posix.jni.wrapper.FileAccessWrapper"/> +- </javah> ++ <exec executable="javah"> ++ <arg value="-d"/> ++ <arg value="${root}/jni"/> ++ <arg value="-force"/> ++ <arg value="-classpath"/> ++ <arg value="${root}/lib/areca.jar"/> ++ <arg value="com.myJava.file.metadata.posix.jni.wrapper.FileAccessWrapper"/> ++ </exec> + + <!-- Compile the JNI code --> + <exec dir="${root}/jni" executable="gcc"> diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index bd7ca8863897..93aff9498df7 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -2,7 +2,7 @@ , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }: -let version = "0.6.0"; in +let version = "0.6.1"; in buildPythonApplication rec { name = "qutebrowser-${version}"; @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "1vf9gh1f12wza72y3yqj568h2wsm7wfvjjs6qsh6apw5mgjysz91"; + sha256 = "1xb95yjc390h7f75l1jk252qiwcamgz2bls2978mmjkhf5hm3jm0"; }; # Needs tox |