From 4ff6cc92b9fcc5c15ad3cf6142b4f5619fe6f827 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 4 Aug 2019 07:42:17 -0400 Subject: [PATCH 1/2] ideogram: init at 1.2.2 --- .../graphics/ideogram/default.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/applications/graphics/ideogram/default.nix diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix new file mode 100644 index 00000000000..c0f2669c526 --- /dev/null +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, python3 +, glib +, gtk3 +, meson +, ninja +, libgee +, pantheon +, desktop-file-utils +, xorg +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "ideogram"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "cassidyjames"; + repo = pname; + rev = version; + sha256 = "1qakgg3y4n2vcnykk2004ndvwmjbk2yy0p4j30mlb7p14dxscif6"; + }; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libgee + pantheon.granite + xorg.libX11 + xorg.libXtst + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "Insert emoji anywhere, even in non-native apps - designed for elementary OS"; + homepage = https://github.com/cassidyjames/ideogram; + license = licenses.gpl2Plus; + maintainers = pantheon.maintainers; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98004a6ce8c..299e319d8f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21864,6 +21864,8 @@ in inherit (pythonPackages) rdflib; }; + ideogram = callPackage ../applications/graphics/ideogram { }; + instead = callPackage ../games/instead { lua = lua5; }; From c5a6c386832969b4be0083995db832a4151ba09e Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 7 Aug 2019 12:22:55 -0400 Subject: [PATCH 2/2] ideogram: fix cassidyjames/ideogram#26 --- pkgs/applications/graphics/ideogram/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index c0f2669c526..1511901ab91 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , pkgconfig , python3 , glib @@ -43,6 +44,14 @@ stdenv.mkDerivation rec { xorg.libXtst ]; + patches = [ + # See: https://github.com/cassidyjames/ideogram/issues/26 + (fetchpatch { + url = "https://github.com/cassidyjames/ideogram/commit/65994ee11bd21f8316b057cec01afbf50639a708.patch"; + sha256 = "12vrvvggpqq53dmhbm7gbbbigncn19m1fjln9wxaady21m0w776c"; + }) + ]; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py