From 4760b6ea6dafa9c1dba26a8aabc59960713eef2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 13 Oct 2015 10:29:43 +0200 Subject: [PATCH] Fixing the gtk attach file dialog for pond. I forgot to wrap the programs for the proper XDG_DATA_DIRS. Thanks Lethalman! (cherry picked from commit 0eb404129f8a0ae2dca7b3c53699f689e0343b65) --- pkgs/top-level/go-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 89d906b6d50..8bd1df44119 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1163,7 +1163,8 @@ let rm -R example gtksourceview ''; nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = [ pkgs.gtk3 pkgs.gtkspell3 ]; + propagatedBuildInputs = [ pkgs.gtk3 ]; + buildInputs = [ pkgs.gtkspell3 ]; }; go-gypsy = buildFromGitHub { @@ -2153,9 +2154,9 @@ let repo = "pond"; sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4"; - buildInputs = [ net crypto protobuf ed25519 pkgs.trousers go-gtk-agl ] + buildInputs = [ net crypto protobuf ed25519 pkgs.trousers ] ++ stdenv.lib.optional isx86_64 pkgs.dclxvi - ++ stdenv.lib.optional gui go-gtk-agl; + ++ stdenv.lib.optionals gui [ go-gtk-agl pkgs.wrapGAppsHook ]; buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui"; excludedPackages = "\\(appengine\\|bn256cgo\\)"; postPatch = stdenv.lib.optionalString isx86_64 ''