summary refs log tree commit diff
path: root/pkgs/tools/graphics
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2017-09-02 18:53:06 +0200
committerMichael Raskin <7c6f434c@mail.ru>2017-09-02 18:53:06 +0200
commit491f5be49b9b802962f698fe77835f4647b34b38 (patch)
tree42ebd89f45040f153cf29c71df5b92f43d0b8a7b /pkgs/tools/graphics
parent522a03cde644df53883b42563f8390e51e21db3a (diff)
downloadnixlib-491f5be49b9b802962f698fe77835f4647b34b38.tar
nixlib-491f5be49b9b802962f698fe77835f4647b34b38.tar.gz
nixlib-491f5be49b9b802962f698fe77835f4647b34b38.tar.bz2
nixlib-491f5be49b9b802962f698fe77835f4647b34b38.tar.lz
nixlib-491f5be49b9b802962f698fe77835f4647b34b38.tar.xz
nixlib-491f5be49b9b802962f698fe77835f4647b34b38.tar.zst
nixlib-491f5be49b9b802962f698fe77835f4647b34b38.zip
Trying a less disruptive patch for Cuneiform
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r--pkgs/tools/graphics/cuneiform/default.nix20
1 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 28699bf69312..7e639940d07e 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, fetchbzr, cmake, patchelf, imagemagick }:
+{ stdenv, fetchurl, cmake, patchelf, imagemagick }:
 
 stdenv.mkDerivation rec {
   name = "cuneiform-${version}";
   version = "1.1.0";
 
-  src = fetchbzr {
-    url = "lp:~f0ma/cuneiform-linux/devel";
-    rev = "540";
-    sha256 = "0sj7v3plf2rrc2vzxl946h9yfribc0jfn4b3ffppghxk2g6kicsb";
+  src = fetchurl {
+    url = "https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2";
+    sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp";
   };
 
-  buildInputs = [
-    cmake imagemagick
+  patches = [
+  (fetchurl {
+    url = "https://git.archlinux.org/svntogit/community.git/plain/cuneiform/trunk/build-fix.patch?id=a2ec92f05de006b56d16ac6a6c370d54a554861a";
+    sha256 = "19cmrlx4khn30qqrpyayn7bicg8yi0wpz1x1bvqqrbvr3kwldxyj";
+  })
   ];
 
+  buildInputs = [ imagemagick ];
+
+  nativeBuildInputs = [ cmake ];
+
   meta = {
     description = "Multi-language OCR system";
     platforms = stdenv.lib.platforms.linux;