diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2024-09-27 11:41:25 +0200 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2024-09-27 11:41:25 +0200 |
| commit | b341506a8d18d8d5d47ed4dbb201c8ed04b183d1 (patch) | |
| tree | aa477119c53f4d71f3cfceb0f827b92e1c13351b /pkgs/tools/networking/netbird | |
| parent | b6b063bdc265990fb87781682da974578b16443c (diff) | |
| parent | fdadb5f0df5d2641c7e4494f4defc31f1e9cb8c0 (diff) | |
Merge branch master into haskell-updates haskell-updates
Conflicts from #341407 resolved.
Diffstat (limited to 'pkgs/tools/networking/netbird')
| -rw-r--r-- | pkgs/tools/networking/netbird/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 18e16956724d9..cffab15b49934 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -44,13 +44,13 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; - buildInputs = lib.optionals (stdenv.isLinux && ui) [ + buildInputs = lib.optionals (stdenv.hostPlatform.isLinux && ui) [ gtk3 libayatana-appindicator libX11 libXcursor libXxf86vm - ] ++ lib.optionals (stdenv.isDarwin && ui) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && ui) [ Cocoa IOKit Kernel @@ -88,7 +88,7 @@ buildGoModule rec { --fish <($out/bin/${binary} completion fish) \ --zsh <($out/bin/${binary} completion zsh) '') - modules) + lib.optionalString (stdenv.isLinux && ui) '' + modules) + lib.optionalString (stdenv.hostPlatform.isLinux && ui) '' mkdir -p $out/share/pixmaps cp $src/client/ui/netbird-systemtray-connected.png $out/share/pixmaps/netbird.png |