diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-04-03 02:22:54 +0300 |
commit | 747ebe3f660ea4a6e7bd03831f4e95a66d59b526 (patch) | |
tree | b9575026aa7949f51541135be0059b54eda07bbe /pkgs/applications/graphics | |
parent | 4c46f13f15c602a88dfd87a37acdc94653232a1d (diff) | |
parent | 00fc66dc7dcda7fc38a9cc7f4dbd7bb66f28c5f9 (diff) | |
download | nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.gz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.bz2 nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.lz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.xz nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.tar.zst nixlib-747ebe3f660ea4a6e7bd03831f4e95a66d59b526.zip |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/openimageio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/processing/default.nix | 39 | ||||
-rw-r--r-- | pkgs/applications/graphics/processing/use-nixpkgs-jre.patch | 88 |
3 files changed, 2 insertions, 129 deletions
diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index c33c0b31a959..49835298f132 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "openimageio-${version}"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "1jn4ph7giwxr65xxbm59i03wywnmxkqnpvqp0kcajl4k48vq3wkr"; + sha256 = "0xyfb41arvi3cc5jvgj2m8skzjrb0xma8sml74svygjgagxfj65h"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix deleted file mode 100644 index 12ff5c772402..000000000000 --- a/pkgs/applications/graphics/processing/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ fetchurl, stdenv, ant, jdk, makeWrapper, libXxf86vm, which }: - -stdenv.mkDerivation rec { - name = "processing-${version}"; - version = "2.2.1"; - - src = fetchurl { - url = "https://github.com/processing/processing/archive/processing-0227-${version}.tar.gz"; - sha256 = "1r8q5y0h4gpqap5jwkspc0li6566hzx5chr7hwrdn8mxlzsm50xk"; - }; - - # Stop it trying to download its own version of java - patches = [ ./use-nixpkgs-jre.patch ]; - - buildInputs = [ ant jdk makeWrapper libXxf86vm which ]; - - buildPhase = "cd build && ant build"; - - installPhase = '' - mkdir -p $out/${name} - mkdir -p $out/bin - cp -r linux/work/* $out/${name}/ - makeWrapper $out/${name}/processing $out/bin/processing \ - --prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \ - --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - makeWrapper $out/${name}/processing-java $out/bin/processing-java \ - --prefix PATH : "${stdenv.lib.makeBinPath [ jdk which ]}" \ - --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - ln -s ${jdk} $out/${name}/java - ''; - - meta = with stdenv.lib; { - description = "A language and IDE for electronic arts"; - homepage = https://processing.org; - license = licenses.gpl2Plus; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch b/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch deleted file mode 100644 index 8f6a5e2018e1..000000000000 --- a/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch +++ /dev/null @@ -1,88 +0,0 @@ -From d1fb63255ff028ecc9cc66d5a6b21b24031b4b4a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com> -Date: Tue, 26 Aug 2014 00:07:58 +0200 -Subject: [PATCH] patch - ---- - build/build.xml | 42 +++++++++++++++++++++--------------------- - 1 file changed, 21 insertions(+), 21 deletions(-) - -diff --git a/build/build.xml b/build/build.xml -index 4d0f0b2..c3f5c09 100755 ---- a/build/build.xml -+++ b/build/build.xml -@@ -640,10 +640,11 @@ - value="jre-tools-6u37-linux${sun.arch.data.model}.tgz" /> - --> - -+ <!-- - <get src="http://processing.googlecode.com/files/${jre.file}" - dest="linux/jre.tgz" - usetimestamp="true" /> -- -+ --> - <!-- - Cannot use ant version of tar because it doesn't preserve properties. - <untar compression="gzip" -@@ -655,39 +656,38 @@ - <!-- - http://www.gnu.org/software/tar/manual/html_section/transform.html - --> -- <exec executable="tar" dir="linux"> -+ <!-- <exec executable="tar" dir="linux"> --> - <!-- Change directory --> - <!-- - <arg value="-C" /> - <arg value="linux/work" /> - <arg value="-xzpf" /> - --> -- <arg value="xfz" /> -- <arg value="jre.tgz"/> -- </exec> -+ <!-- <arg value="xfz" /> --> -+ <!-- <arg value="jre.tgz"/> --> -+ <!-- </exec> --> - - <!-- - We only want to move when the folder didn't exist before - <move file="linux/jre1.7.0_40" tofile="linux/work/java" /> - --> -- <exec executable="rsync" dir="linux"> -- <arg value="-a" /> -- <arg value="--delete" /> -- <arg value="jre1.7.0_40/" /> -- <arg value="work/java" /> -- </exec> -- <delete dir="linux/jre1.7.0_40" /> -+ <!-- <exec executable="rsync" dir="linux"> --> -+ <!-- <arg value="-a" /> --> -+ <!-- <arg value="jre1.7.0_40/" /> --> -+ <!-- <arg value="work/java" /> --> -+ <!-- </exec> --> -+ <!-- <delete dir="linux/jre1.7.0_40" /> --> - - <!-- Remove unused JRE bloat. --> -- <delete> -- <fileset refid="javafx-basics" /> -- <fileset refid="javafx-linux-${sun.arch.data.model}" /> -- <fileset refid="jre-optional-linux" /> -- </delete> -- -- <copy todir="linux/work/java/lib/fonts"> -- <fileset dir="shared/lib/fonts" includes="*" /> -- </copy> -+ <!-- <delete> --> -+ <!-- <fileset refid="javafx-basics" /> --> -+ <!-- <fileset refid="javafx-linux-${sun.arch.data.model}" /> --> -+ <!-- <fileset refid="jre-optional-linux" /> --> -+ <!-- </delete> --> -+ -+ <!-- <copy todir="linux/work/java/lib/fonts"> --> -+ <!-- <fileset dir="shared/lib/fonts" includes="*" /> --> -+ <!-- </copy> --> - - </target> - --- -2.1.0 - |