diff options
author | Nick Cao <nickcao@nichi.co> | 2023-04-08 15:29:42 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-08 15:29:42 +0800 |
commit | de33bfe022ec51c11903bf6f1380a44e38843018 (patch) | |
tree | ff210219a5dd77ac1b023414353ae4b962c07adb | |
parent | 52a158c0a5758b22fdcd960f7ab913aa6ba18e93 (diff) | |
parent | be1280ceea8d4b3cd699d7b65007c3aa0898a329 (diff) | |
download | nixpkgs-de33bfe022ec51c11903bf6f1380a44e38843018.tar nixpkgs-de33bfe022ec51c11903bf6f1380a44e38843018.tar.gz nixpkgs-de33bfe022ec51c11903bf6f1380a44e38843018.tar.bz2 nixpkgs-de33bfe022ec51c11903bf6f1380a44e38843018.tar.lz nixpkgs-de33bfe022ec51c11903bf6f1380a44e38843018.tar.xz nixpkgs-de33bfe022ec51c11903bf6f1380a44e38843018.tar.zst nixpkgs-de33bfe022ec51c11903bf6f1380a44e38843018.zip |
Merge pull request #221310 from uninsane/pr/sane/cross-browserpass
browserpass: support cross compilation by only conditionally running tests
-rw-r--r-- | pkgs/tools/security/browserpass/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index 31a0bd63db0..83f34e2f066 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -1,4 +1,11 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, gnupg }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, gnupg +, makeWrapper +}: + buildGoModule rec { pname = "browserpass"; version = "3.1.0"; @@ -14,7 +21,7 @@ buildGoModule rec { vendorHash = "sha256-CjuH4ANP2bJDeA+o+1j+obbtk5/NVLet/OFS3Rms4r0="; - doCheck = false; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; postPatch = '' # Because this Makefile will be installed to be used by the user, patch @@ -32,9 +39,11 @@ buildGoModule rec { ''; buildPhase = '' - make + make browserpass ''; + checkTarget = "test"; + installPhase = '' make install |