cfdg: 3.0.9 -> 3.2_2, fix build

1 files changed, 10 insertions, 8 deletions

diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix
index 2c96e872f4e6..1fd4d3324a0b 100644
--- a/pkgs/tools/graphics/cfdg/default.nix
+++ b/pkgs/tools/graphics/cfdg/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl, libpng, bison, flex, ffmpeg }:
+{ stdenv, fetchFromGitHub, libpng, bison, flex, ffmpeg, icu }:
 
 stdenv.mkDerivation rec {
   pname = "cfdg";
-  version = "3.0.9";
-  src = fetchurl {
-    sha256 = "1jqpinz6ri4a2l04mf2z1ljalkdk1m07hj47lqkh8gbf2slfs0jl";
-    url = "http://www.contextfreeart.org/download/ContextFreeSource${version}.tgz";
+  version = "3.2_2";
+  src = fetchFromGitHub {
+    owner = "MtnViewJohn";
+    repo = "context-free";
+    rev = "Version${version}";
+    sha256 = "14v1gya7h0p9dj16hw87wpmjfddmkz537w3kjvaribgxxp0gzyz5";
   };
 
-  buildInputs = [ libpng bison flex ffmpeg ];
+  buildInputs = [ libpng bison flex ffmpeg icu ];
 
   postPatch = ''
     sed -e "/YY_NO_UNISTD/a#include <stdio.h>" -i src-common/cfdg.l
+    sed -e '1i#include <algorithm>' -i src-common/{cfdg,builder,ast}.cpp
   '';
 
   installPhase = ''
@@ -26,8 +29,7 @@ stdenv.mkDerivation rec {
     description = "Context-free design grammar - a tool for graphics generation";
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
-    homepage = https://contextfreeart.org/;
+    homepage = "https://contextfreeart.org/";
     license = licenses.gpl2;
-    downloadPage = "https://contextfreeart.org/mediawiki/index.php/Download_page";
   };
 }