diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:35:07 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-18 14:46:20 +0100 |
commit | 0a58b512cb696b2482cbac4fd3a20b43ae31c1bc (patch) | |
tree | 7ae35a255ac57b66696c3db743f6ed9a4dab7431 /pkgs/applications/graphics | |
parent | 284833649192072959a335367374fc0a6ec667df (diff) | |
parent | 9c1d3bfa9f7d7b95eb20d0f729e3b3c9d7abcd4b (diff) | |
download | nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.gz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.bz2 nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.lz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.xz nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.tar.zst nixlib-0a58b512cb696b2482cbac4fd3a20b43ae31c1bc.zip |
Merge master into stdenv-updates
Conflicts (simple): pkgs/development/compilers/gcc/4.8/default.nix pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/gmp/5.1.1.nix pkgs/development/libraries/gmp/5.1.3.nix pkgs/development/libraries/gmp/5.1.x.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/gocr/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/graphics/zgrviewer/default.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index 0f42ac7743e3..15a8ab713dba 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, tk }: stdenv.mkDerivation rec { - name = "gocr-0.49"; + name = "gocr-0.50"; src = fetchurl { - url = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz; - sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc"; + url = "http://www-e.uni-magdeburg.de/jschulen/ocr/${name}.tar.gz"; + sha256 = "1dgmcpapy7h68d53q2c5d0bpgzgfb2nw2blndnx9qhc7z12149mw"; }; postInstall = '' diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index 93d1b28854a6..4eefd5749b65 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [jre unzip]; buildPhase = ""; installPhase = '' - mkdir -p "$out"/{bin,lib/java/zvtm/plugins,share/doc/zvtm} + mkdir -p "$out"/{bin,share/java/zvtm/plugins,share/doc/zvtm} cp overview.html *.license.* "$out/share/doc/zvtm" - cp -r target/* "$out/lib/java/zvtm/" + cp -r target/* "$out/share/java/zvtm/" echo '#!/bin/sh' > "$out/bin/zgrviewer" - echo "java -jar '$out/lib/java/zvtm/zgrviewer-${version}.jar'" >> "$out/bin/zgrviewer" + echo "java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar'" >> "$out/bin/zgrviewer" chmod a+x "$out/bin/zgrviewer" ''; meta = { |