From 728a5ed5fdbe96c1347c21d3484667e39dd7c7cf Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 27 Jan 2019 18:23:08 -0600 Subject: [PATCH 1/2] birdfont: init at 2.25.0 (and add dep xmlbird) --- pkgs/tools/misc/birdfont/default.nix | 22 ++++++++++++++++++++++ pkgs/tools/misc/birdfont/xmlbird.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 3 files changed, 46 insertions(+) create mode 100644 pkgs/tools/misc/birdfont/default.nix create mode 100644 pkgs/tools/misc/birdfont/xmlbird.nix diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix new file mode 100644 index 00000000000..df65f6f5a63 --- /dev/null +++ b/pkgs/tools/misc/birdfont/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, python3, xmlbird, +cairo, gdk_pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala, +gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "birdfont"; + version = "2.25.0"; + + src = fetchurl { + url = "https://birdfont.org/releases/${pname}-${version}.tar.xz"; + sha256 = "0fi86km9iaxs9b8lqz81079vppzp346kqiqk44vk45dclr5r6x22"; + }; + + nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection wrapGAppsHook ]; + buildInputs = [ xmlbird libgee cairo gdk_pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; + + postPatch = "patchShebangs ."; + + buildPhase = "./build.py"; + + installPhase = "./install.py"; +} diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix new file mode 100644 index 00000000000..5acdfea3087 --- /dev/null +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, python3, pkgconfig, vala, glib, gobject-introspection }: + +stdenv.mkDerivation rec { + pname = "xmlbird"; + version = "1.2.10"; + + src = fetchurl { + url = "https://birdfont.org/${pname}-releases/lib${pname}-${version}.tar.xz"; + sha256 = "0qpqpqqd4wj711jzczfsr38fgcz1rzxchrqbssxnan659ycd9c78"; + }; + + nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection ]; + + buildInputs = [ glib ]; + + postPatch = "patchShebangs ."; + + buildPhase = "./build.py"; + + installPhase = "./install.py"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 510018c2301..21486733d21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1733,6 +1733,9 @@ in biber = callPackage ../tools/typesetting/biber { }; + birdfont = callPackage ../tools/misc/birdfont { }; + xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { }; + blastem = callPackage ../misc/emulators/blastem { inherit (python27Packages) pillow; }; From 596c7f0cf784fc8f906a9be9e3f65ee2df580bb6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 28 Jan 2019 21:37:48 -0600 Subject: [PATCH 2/2] birdfont,xmlbird: add missing meta, oops --- pkgs/tools/misc/birdfont/default.nix | 7 +++++++ pkgs/tools/misc/birdfont/xmlbird.nix | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index df65f6f5a63..9dd84471922 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -19,4 +19,11 @@ stdenv.mkDerivation rec { buildPhase = "./build.py"; installPhase = "./install.py"; + + meta = with stdenv.lib; { + description = "Font editor which can generate fonts in TTF, EOT, SVG and BIRDFONT format"; + homepage = https://birdfont.org; + license = licenses.gpl3; + maintainers = with maintainers; [ dtzWill ]; + }; } diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix index 5acdfea3087..a5581c84d50 100644 --- a/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -18,4 +18,11 @@ stdenv.mkDerivation rec { buildPhase = "./build.py"; installPhase = "./install.py"; + + meta = with stdenv.lib; { + description = "XML parser for Vala and C programs"; + homepage = https://birdfont.org/xmlbird.php; + license = licenses.lgpl3; + maintainers = with maintainers; [ dtzWill ]; + }; }