From 27e04d8d6621fefac98be076103fe3cb0e73b162 Mon Sep 17 00:00:00 2001 From: Lukas Niederbremer Date: Tue, 21 Mar 2023 12:12:39 +0100 Subject: [PATCH] k3s: Adjust tags to dynamically link against sqlite --- pkgs/applications/networking/cluster/k3s/1_23/default.nix | 5 ++++- pkgs/applications/networking/cluster/k3s/1_24/default.nix | 5 ++++- pkgs/applications/networking/cluster/k3s/1_25/default.nix | 5 ++++- pkgs/applications/networking/cluster/k3s/1_26/default.nix | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/1_23/default.nix b/pkgs/applications/networking/cluster/k3s/1_23/default.nix index 3abe8c675539..d19ae321ad65 100644 --- a/pkgs/applications/networking/cluster/k3s/1_23/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_23/default.nix @@ -22,6 +22,7 @@ , fetchgit , zstd , yq-go +, sqlite , nixosTests , k3s , pkgsBuildBuild @@ -174,11 +175,13 @@ let vendorSha256 = k3sVendorSha256; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libseccomp ]; + buildInputs = [ libseccomp sqlite.dev ]; subPackages = [ "cmd/server" ]; ldflags = versionldflags; + tags = [ "libsqlite3" "linux" ]; + # create the multicall symlinks for k3s postInstall = '' mv $out/bin/server $out/bin/k3s diff --git a/pkgs/applications/networking/cluster/k3s/1_24/default.nix b/pkgs/applications/networking/cluster/k3s/1_24/default.nix index 2ff642f35111..8ead6e5fc82a 100644 --- a/pkgs/applications/networking/cluster/k3s/1_24/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_24/default.nix @@ -22,6 +22,7 @@ , fetchgit , zstd , yq-go +, sqlite , nixosTests , k3s , pkgsBuildBuild @@ -172,11 +173,13 @@ let vendorSha256 = k3sVendorSha256; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libseccomp ]; + buildInputs = [ libseccomp sqlite.dev ]; subPackages = [ "cmd/server" ]; ldflags = versionldflags; + tags = [ "libsqlite3" "linux" ]; + # create the multicall symlinks for k3s postInstall = '' mv $out/bin/server $out/bin/k3s diff --git a/pkgs/applications/networking/cluster/k3s/1_25/default.nix b/pkgs/applications/networking/cluster/k3s/1_25/default.nix index 5b5fc097e77d..25234f1d4423 100644 --- a/pkgs/applications/networking/cluster/k3s/1_25/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_25/default.nix @@ -22,6 +22,7 @@ , fetchgit , zstd , yq-go +, sqlite , nixosTests , pkgsBuildBuild , k3s @@ -171,11 +172,13 @@ let vendorSha256 = k3sVendorSha256; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libseccomp ]; + buildInputs = [ libseccomp sqlite.dev ]; subPackages = [ "cmd/server" ]; ldflags = versionldflags; + tags = [ "libsqlite3" "linux" ]; + # create the multicall symlinks for k3s postInstall = '' mv $out/bin/server $out/bin/k3s diff --git a/pkgs/applications/networking/cluster/k3s/1_26/default.nix b/pkgs/applications/networking/cluster/k3s/1_26/default.nix index ecd8b4005652..b52cb70ca930 100644 --- a/pkgs/applications/networking/cluster/k3s/1_26/default.nix +++ b/pkgs/applications/networking/cluster/k3s/1_26/default.nix @@ -22,6 +22,7 @@ , fetchgit , zstd , yq-go +, sqlite , nixosTests , pkgsBuildBuild }: @@ -175,11 +176,13 @@ let vendorSha256 = k3sVendorSha256; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libseccomp ]; + buildInputs = [ libseccomp sqlite.dev ]; subPackages = [ "cmd/server" ]; ldflags = versionldflags; + tags = [ "libsqlite3" "linux" ]; + # create the multicall symlinks for k3s postInstall = '' mv $out/bin/server $out/bin/k3s