From a8d2f2dfcd31fa532386297b108d829cd32c7524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 5 Oct 2015 10:30:10 +0200 Subject: [PATCH] Making pond with GUI (gtk). (cherry picked from commit a1107b2bd2e8946c2b0ab71de5eeb0d9df30a405) --- pkgs/top-level/go-packages.nix | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 9f9ad6f751d9..89d906b6d50d 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1152,6 +1152,20 @@ let propagatedBuildInputs = [ go-querystring ]; }; + go-gtk-agl = buildFromGitHub { + rev = "6937b8d28cf70d583346220b966074cfd3a2e233"; + owner = "agl"; + repo = "go-gtk"; + sha256 = "0jnhsv7ypyhprpy0fndah22v2pbbavr3db6f9wxl1vf34qkns3p4"; + # Examples require many go libs, and gtksourceview seems ready only for + # gtk2 + preConfigure = '' + rm -R example gtksourceview + ''; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pkgs.gtk3 pkgs.gtkspell3 ]; + }; + go-gypsy = buildFromGitHub { rev = "42fc2c7ee9b8bd0ff636cd2d7a8c0a49491044c5"; owner = "kylelemons"; @@ -2130,15 +2144,19 @@ let doCheck = false; # bad import path in tests }; - pond = let isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64; in buildFromGitHub { + pond = let + isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64; + gui = true; # Might be implemented with nixpkgs config. + in buildFromGitHub { rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; owner = "agl"; repo = "pond"; sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4"; - buildInputs = [ net crypto protobuf ed25519 pkgs.trousers ] - ++ stdenv.lib.optional isx86_64 pkgs.dclxvi; - buildFlags = "-tags nogui"; + buildInputs = [ net crypto protobuf ed25519 pkgs.trousers go-gtk-agl ] + ++ stdenv.lib.optional isx86_64 pkgs.dclxvi + ++ stdenv.lib.optional gui go-gtk-agl; + buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui"; excludedPackages = "\\(appengine\\|bn256cgo\\)"; postPatch = stdenv.lib.optionalString isx86_64 '' grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \