diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-03-12 18:30:50 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-03-12 18:55:42 -0400 |
commit | 2d1d83d836e09e50469302101955ea6c58dcd206 (patch) | |
tree | 797ce574ceb2cf94da6a14f3523e5ec00f7043a9 | |
parent | b152dcf852ecef3e30a632f0050abb30a26e1dfd (diff) | |
download | nixpkgs-2d1d83d836e09e50469302101955ea6c58dcd206.tar nixpkgs-2d1d83d836e09e50469302101955ea6c58dcd206.tar.gz nixpkgs-2d1d83d836e09e50469302101955ea6c58dcd206.tar.bz2 nixpkgs-2d1d83d836e09e50469302101955ea6c58dcd206.tar.lz nixpkgs-2d1d83d836e09e50469302101955ea6c58dcd206.tar.xz nixpkgs-2d1d83d836e09e50469302101955ea6c58dcd206.tar.zst nixpkgs-2d1d83d836e09e50469302101955ea6c58dcd206.zip |
pond: Simplify platform logic
-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 002d0345a00..5d463648bd8 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" |