diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-03-12 19:06:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-12 19:06:35 -0400 |
commit | 62ca2316a4a20a99ff87650065f63697bb9af6f6 (patch) | |
tree | 2ee19a26825d91cdbc030f5fbf9f2082338005a7 /pkgs/applications/networking/instant-messengers | |
parent | 40e3ad60aaa0bdcec71409ae167c2b1425bffe06 (diff) | |
parent | 2d1d83d836e09e50469302101955ea6c58dcd206 (diff) | |
download | nixlib-62ca2316a4a20a99ff87650065f63697bb9af6f6.tar nixlib-62ca2316a4a20a99ff87650065f63697bb9af6f6.tar.gz nixlib-62ca2316a4a20a99ff87650065f63697bb9af6f6.tar.bz2 nixlib-62ca2316a4a20a99ff87650065f63697bb9af6f6.tar.lz nixlib-62ca2316a4a20a99ff87650065f63697bb9af6f6.tar.xz nixlib-62ca2316a4a20a99ff87650065f63697bb9af6f6.tar.zst nixlib-62ca2316a4a20a99ff87650065f63697bb9af6f6.zip |
Merge pull request #36885 from obsidiansystems/meta-host-prepare
treewide: Prepare for #34444
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pond/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 002d0345a000..5d463648bd8b 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -2,7 +2,6 @@ fetchgit, fetchhg, fetchbzr, fetchsvn }: let - isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64; gui = true; # Might be implemented with nixpkgs config. in buildGoPackage rec { @@ -22,11 +21,11 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ trousers gtk3 gtkspell3 ] - ++ stdenv.lib.optional isx86_64 dclxvi + ++ stdenv.lib.optional stdenv.hostPlatform.isx86_64 dclxvi ++ stdenv.lib.optionals gui [ wrapGAppsHook ]; buildFlags = stdenv.lib.optionalString (!gui) "-tags nogui"; excludedPackages = "\\(appengine\\|bn256cgo\\)"; - postPatch = stdenv.lib.optionalString isx86_64 '' + postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isx86_64 '' grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \ -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \ -e "s,bn256\.,bn256cgo.,g" |