From f1d1cae1a1634eeec7e5f6708741e604fe923655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferry=20J=C3=A9r=C3=A9mie?= Date: Thu, 13 Feb 2020 23:38:05 +0100 Subject: [PATCH 1/2] maintainers: add mothsart --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 34d1bc876c85..537e0ed11c21 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4899,6 +4899,12 @@ githubId = 118035; name = "Corbin Simpson"; }; + mothsart = { + email = "jerem.ferry@gmail.com"; + github = "mothsart"; + githubId = 10601196; + name = "Jérémie Ferry"; + }; mounium = { email = "muoniurn@gmail.com"; github = "mounium"; From e3c10922323352ab0e3f9b967932f3cf1e230976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferry=20J=C3=A9r=C3=A9mie?= Date: Mon, 24 Feb 2020 14:15:27 +0100 Subject: [PATCH 2/2] drawing: init at 0.4.11 --- .../applications/graphics/drawing/default.nix | 69 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/applications/graphics/drawing/default.nix diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix new file mode 100644 index 000000000000..67fa5da398bc --- /dev/null +++ b/pkgs/applications/graphics/drawing/default.nix @@ -0,0 +1,69 @@ +{ lib +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, python3 +, gtk3 +, appstream-glib +, desktop-file-utils +, gobject-introspection +, wrapGAppsHook +, glib +, gdk-pixbuf +, pango +, gettext +}: + +python3.pkgs.buildPythonApplication rec { + pname = "drawing"; + version = "0.4.11"; + + format = "other"; + + src = fetchFromGitHub { + owner = "maoschanz"; + repo = pname; + rev = version; + sha256 = "00c1h6jns11rmsg35gy40fb6ahvik80wpbm2133bjcqxfwwnlal6"; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gobject-introspection + meson + ninja + pkgconfig + wrapGAppsHook + glib + gettext + ]; + + buildInputs = [ + glib + gtk3 + gdk-pixbuf + pango + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pycairo + pygobject3 + ]; + + postPatch = '' + chmod +x build-aux/meson/postinstall.py # patchShebangs requires executable file + patchShebangs build-aux/meson/postinstall.py + ''; + + strictDeps = false; + + meta = with lib; { + description = "A free basic image editor, similar to Microsoft Paint, but aiming at the GNOME desktop"; + homepage = "https://maoschanz.github.io/drawing/"; + maintainers = with maintainers; [ mothsart ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d3691ce2293..9f89510da1d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18686,6 +18686,8 @@ in dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { }; + drawing = callPackage ../applications/graphics/drawing { }; + drawio = callPackage ../applications/graphics/drawio {}; drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { };