diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-10 00:02:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-10 00:02:52 +0000 |
| commit | 2282e994f2aea6a5f5aebceeaa6d8eb075b14e70 (patch) | |
| tree | 87439eaadce4bdb7a42861dd375108e834f4dec2 /pkgs/tools/misc | |
| parent | 55c4a726fe944d4a637affde93b2594f0bc0aa07 (diff) | |
| parent | f09c526834e74be6eaeb2555841c88ac7ecc8600 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/gotify-desktop/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/misc/nbench/default.nix | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/misc/gotify-desktop/default.nix b/pkgs/tools/misc/gotify-desktop/default.nix index e34afda942415..dd0af48ec64f3 100644 --- a/pkgs/tools/misc/gotify-desktop/default.nix +++ b/pkgs/tools/misc/gotify-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config}: +{ lib, fetchFromGitHub, rustPlatform, openssl, pkg-config, stdenv}: rustPlatform.buildRustPackage rec { pname = "gotify-desktop"; @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/desbma/gotify-desktop"; license = licenses.gpl3Plus; maintainers = with maintainers; [ bryanasdev000 genofire ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix index 16e67b848d65d..744ce314ec4e2 100644 --- a/pkgs/tools/misc/nbench/default.nix +++ b/pkgs/tools/misc/nbench/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-static" "" ''; + buildInputs = lib.optionals stdenv.hostPlatform.isGnu [ + stdenv.glibc.static + ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' |