diff options
author | Katharina Fey <kookie@spacekookie.de> | 2020-02-03 09:26:35 +0100 |
---|---|---|
committer | Katharina Fey <kookie@spacekookie.de> | 2020-02-03 09:26:35 +0100 |
commit | 899a451e08f7d6d2c8214d119c2a0316849a0ed4 (patch) | |
tree | 5e72a7288b7d2b33fead36fbfe91a02a48ff7fef /nixpkgs/pkgs/tools/graphics/cfdg/default.nix | |
parent | 5962418b6543dfb3ca34965c0fa16dd77543801b (diff) | |
parent | a21c2fa3ea2b88e698db6fc151d9c7259ae14d96 (diff) |
Merge commit 'a21c2fa3ea2b88e698db6fc151d9c7259ae14d96'
Diffstat (limited to 'nixpkgs/pkgs/tools/graphics/cfdg/default.nix')
-rw-r--r-- | nixpkgs/pkgs/tools/graphics/cfdg/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/tools/graphics/cfdg/default.nix b/nixpkgs/pkgs/tools/graphics/cfdg/default.nix index 2c96e872f4e..1fd4d3324a0 100644 --- a/nixpkgs/pkgs/tools/graphics/cfdg/default.nix +++ b/nixpkgs/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"; }; } |