From 5496caac483b701c7e3968e54a863919c443a81e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 28 Sep 2019 19:04:53 +0300 Subject: [PATCH 1/3] hasmail: init at 2019-08-24 --- .../mailreaders/hasmail/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/hasmail/default.nix diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix new file mode 100644 index 00000000000..05d869e3349 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, pkgconfig +, gobject-introspection +, pango +, cairo +, gtk2 +}: + +buildGoModule rec { + pname = "hasmail"; + version = "2019-08-24"; + name = "${pname}-${version}-unstable"; + + src = fetchFromGitHub { + owner = "jonhoo"; + repo = "hasmail"; + rev = "eb52536d26815383bfe5990cd5ace8bb9d036c8d"; + sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1"; + }; + + modSha256 = "0z3asz7v1izg81f9xifx9s2sp5hly173hajsn9idi3bkv0h78is2"; + + buildInputs = [ + pkgconfig + gobject-introspection + pango + cairo + gtk2 + ]; + + meta = with lib; { + description = "Simple tray icon for detecting new email on IMAP servers"; + homepage = "https://github.com/jonhoo/hasmail"; + license = licenses.unlicense; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c71abe5e309..f3b5f68e410 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3720,6 +3720,8 @@ in hash-slinger = callPackage ../tools/security/hash-slinger { }; + hasmail = callPackage ../applications/networking/mailreaders/hasmail { }; + hal-flash = callPackage ../os-specific/linux/hal-flash { }; half = callPackage ../development/libraries/half { }; From a4487e81c7cf817cc72a21728f21ec65b40d2885 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 30 Sep 2019 15:44:14 +0300 Subject: [PATCH 2/3] Use only pname instead of name attr --- pkgs/applications/networking/mailreaders/hasmail/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index 05d869e3349..2e2042d8b07 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -9,9 +9,8 @@ }: buildGoModule rec { - pname = "hasmail"; + pname = "hasmail-unstable"; version = "2019-08-24"; - name = "${pname}-${version}-unstable"; src = fetchFromGitHub { owner = "jonhoo"; From fb6dd16789f7e8069407ee03ca70559218368dc9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 30 Sep 2019 15:44:41 +0300 Subject: [PATCH 3/3] Remove gobject-introspection and put pkgconfig in native --- .../applications/networking/mailreaders/hasmail/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index 2e2042d8b07..49f0ac53365 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -21,9 +21,11 @@ buildGoModule rec { modSha256 = "0z3asz7v1izg81f9xifx9s2sp5hly173hajsn9idi3bkv0h78is2"; - buildInputs = [ + nativeBuildInputs = [ pkgconfig - gobject-introspection + ]; + + buildInputs = [ pango cairo gtk2