Unverified Commit 7b67f786 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #222339 from chmod222/k3s-sqlite 

k3s: Adjust Go tags to dynamically link against sqlite
parents cece2880 27e04d8d

pkgs/applications/networking/cluster/k3s/1_23/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -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

pkgs/applications/networking/cluster/k3s/1_24/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -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

pkgs/applications/networking/cluster/k3s/1_25/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -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

pkgs/applications/networking/cluster/k3s/1_26/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -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