From 498e998cd769c46b45f92df1b397fd472c6708b8 Mon Sep 17 00:00:00 2001 From: hutli Date: Fri, 1 Mar 2024 14:29:03 +0100 Subject: [PATCH] buildStatic variable to toggle static builds --- .devops/nix/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.devops/nix/package.nix b/.devops/nix/package.nix index e039f6aa1..10dbd1e63 100644 --- a/.devops/nix/package.nix +++ b/.devops/nix/package.nix @@ -1,6 +1,6 @@ { - pkgs, lib, + glibc, config, stdenv, mkShell, @@ -31,6 +31,7 @@ useRocm ? config.rocmSupport, useVulkan ? false, llamaVersion ? "0.0.0", # Arbitrary version, substituted by the flake + buildStatic ? false, }@inputs: let @@ -161,7 +162,6 @@ effectiveStdenv.mkDerivation ( ninja pkg-config git - pkgs.glibc.static ] ++ optionals useCuda [ cudaPackages.cuda_nvcc @@ -169,6 +169,9 @@ effectiveStdenv.mkDerivation ( # TODO: Replace with autoAddDriverRunpath # once https://github.com/NixOS/nixpkgs/pull/275241 has been merged cudaPackages.autoAddOpenGLRunpathHook + ] + ++ optionals buildStatic [ + glibc.static ]; buildInputs = @@ -183,7 +186,7 @@ effectiveStdenv.mkDerivation ( [ (cmakeBool "LLAMA_NATIVE" false) (cmakeBool "LLAMA_BUILD_SERVER" true) - (cmakeBool "BUILD_SHARED_LIBS" false) + (cmakeBool "BUILD_SHARED_LIBS" !buildStatic) (cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) (cmakeBool "LLAMA_BLAS" useBlas) (cmakeBool "LLAMA_CLBLAST" useOpenCL) @@ -192,7 +195,7 @@ effectiveStdenv.mkDerivation ( (cmakeBool "LLAMA_METAL" useMetalKit) (cmakeBool "LLAMA_MPI" useMpi) (cmakeBool "LLAMA_VULKAN" useVulkan) - (cmakeBool "LLAMA_STATIC" true) + (cmakeBool "LLAMA_STATIC" buildStatic) ] ++ optionals useCuda [ (