summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Walther <walther@technowledgy.de>2025-08-09 17:23:19 +0000
committerGitHub <noreply@github.com>2025-08-09 17:23:19 +0000
commitd81274c996e77c903d44d33d9c65d9e7875d9d81 (patch)
tree94ba8a34c2a02b4fbf5d5f5592609863c25b713c
parent[Backport release-25.05] docker_28: 28.3.2 -> 28.3.3, docker_25: 25.0.11 -> 2... (diff)
parentbtop: 1.4.3 -> 1.4.4 (diff)
downloadnixpkgs-d81274c996e77c903d44d33d9c65d9e7875d9d81.tar.gz
[Backport release-25.05] btop: 1.4.3 -> 1.4.4 (#430868)
-rw-r--r--pkgs/by-name/bt/btop/package.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix
index a4017138cae0..4e787bc862fd 100644
--- a/pkgs/by-name/bt/btop/package.nix
+++ b/pkgs/by-name/bt/btop/package.nix
@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "btop";
- version = "1.4.3";
+ version = "1.4.4";
src = fetchFromGitHub {
owner = "aristocratos";
repo = pname;
rev = "v${version}";
- hash = "sha256-4x2vGmH2dfHZHG+zj2KGsL/pRNIZ8K8sXYRHy0io5IE=";
+ hash = "sha256-4H9UjewJ7UFQtTQYwvHZL3ecPiChpfT6LEZwbdBCIa0=";
};
nativeBuildInputs = [
@@ -37,6 +37,11 @@ stdenv.mkDerivation rec {
installFlags = [ "PREFIX=$(out)" ];
+ # fix build on darwin (see https://github.com/NixOS/nixpkgs/pull/422218#issuecomment-3039181870 and https://github.com/aristocratos/btop/pull/1173)
+ cmakeFlags = [
+ (lib.cmakeBool "BTOP_LTO" (!stdenv.hostPlatform.isDarwin))
+ ];
+
postInstall = ''
${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/bin/btop)
'';