diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-08-09 18:28:15 +0200 |
commit | d9fa74ba7891cfae4a029ee79dd29e4ab3425385 (patch) | |
tree | 82f79c8dc3d5cf7108055155e6332f64485b0acf /pkgs/applications/graphics | |
parent | 8b834605628fabd43b1b26a1724fb22c83150e2d (diff) | |
parent | 8c7fa1e836b8929d29c7ec34f968a3eef11e69de (diff) |
Merge master into staging
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/animbar/default.nix | 40 | ||||
-rw-r--r-- | pkgs/applications/graphics/processing3/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/graphics/renderdoc/default.nix | 4 |
3 files changed, 46 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix new file mode 100644 index 0000000000000..0d6b538b1072d --- /dev/null +++ b/pkgs/applications/graphics/animbar/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchurl, cmake, qt4, file, gcc }: + +stdenv.mkDerivation rec { + pname = "animbar"; + version = "1.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + sha256 = "0836nwcpyfdrapyj3hbg3wh149ihc26pc78h01adpc7c0r7d9pr9"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt4 file ]; + + installPhase = '' + mkdir -p $out/bin $out/share/pixmaps + cp src/animbar $out/bin + cp ../icon/* $out/share/pixmaps + ''; + + meta = with lib; { + description = "Create your own animation on paper and transparancy"; + longDescription = '' + Animbar lets you easily create your own animation on paper and + transparancy. From a set of input images two output images are + computed, that are printed one on paper and one on + transparency. By moving the transparency over the paper you + create a fascinating animation effect. This kind of animation + technique is hundreds of years old and known under several + names: picket fence animation, barrier grid animation, Moiré + animation, to name a few. + ''; + homepage = http://animbar.mnim.org; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix index 6916ef4ad7aad..5575c56b7fd09 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing3/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - version = "3.3.7"; + version = "3.4"; name = "processing3-${version}"; src = fetchFromGitHub { owner = "processing"; repo = "processing"; - rev = "processing-0264-3.3.7"; - sha256 = "0a20z19lmc4xarfnr7xshcmlv3xkc2dgjxknis0iv79gxnwlqhpq"; + rev = "processing-0265-${version}"; + sha256 = "12wpxgn2wd5vbasx9584w5yb1s319smq1zh8m7dvp7gkqw9plwp4"; }; nativeBuildInputs = [ ant rsync makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml install -D -m0444 ${fetchurl { url = http://download.processing.org/reference.zip; - sha256 = "104zig026y8vbl4qksmscjq0bms8mi2jmri1ijdlbkxcqnv9bnlf"; + sha256 = "0dli1bdgw8hsx7g7b048ap81v2za9maa6pfcwdqm3qkfypr8q7pr"; } } ./java/reference.zip diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 9a21d457a83f1..99e250e9e4d7d 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -12,14 +12,14 @@ let }; in stdenv.mkDerivation rec { - version = "1.0"; + version = "1.1"; name = "renderdoc-${version}"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "0l7pjxfrly4llryjnwk42dzx65n78wc98h56qm4yh04ja8fdbx2y"; + sha256 = "0kb9m1dm0mnglqyh1srvl0f1bgjghxzbqarn0xfqw49wphqwhmcd"; }; buildInputs = [ |