From 74b8d1103357e55571cb42ebc0bfd41901d2c212 Mon Sep 17 00:00:00 2001 From: Martin Larsson Date: Tue, 13 May 2025 11:45:32 +0200 Subject: [PATCH] Separate bitwarden-cli between darwin/linux, darwin needs to build using old llvm toolchain, doesnt compile on latest. This is a temporary workaround --- nix/home/darwin.nix | 9 +++++++++ nix/home/default.nix | 1 - nix/home/linux.nix | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nix/home/darwin.nix b/nix/home/darwin.nix index d5d9079..47b08a8 100644 --- a/nix/home/darwin.nix +++ b/nix/home/darwin.nix @@ -1,9 +1,18 @@ { pkgs, config, ... }: +let + bitwarden_cli = pkgs.bitwarden-cli.overrideAttrs (oldAttrs: { + stdenv = pkgs.llvmPackages_18.stdenv; + nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ pkgs.llvmPackages_18.stdenv.cc ]; + CXX = "${pkgs.llvmPackages_18.clang}/bin/clang++"; + CC = "${pkgs.llvmPackages_18.clang}/bin/clang"; + }); +in { home = { packages = with pkgs; [ gawk discord + bitwarden_cli ]; file = { ".config/aerospace/aerospace.toml".source = diff --git a/nix/home/default.nix b/nix/home/default.nix index 8589f13..128cb64 100644 --- a/nix/home/default.nix +++ b/nix/home/default.nix @@ -111,7 +111,6 @@ in bc cmatrix svelte-language-server - bitwarden-cli ]; file = utils.mk_symlinks { inherit config dotfiles; }; diff --git a/nix/home/linux.nix b/nix/home/linux.nix index 6470ce9..b8dc0b0 100644 --- a/nix/home/linux.nix +++ b/nix/home/linux.nix @@ -50,6 +50,7 @@ in blueman playerctl mako + bitwarden-cli ]; file = utils.mk_symlinks { inherit config dotfiles; };