diff options
| author | Ivv <41924494+IvarWithoutBones@users.noreply.github.com> | 2022-07-14 20:30:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-14 20:30:41 +0200 |
| commit | 2ca3a5e4aa34bf5b9d4106fb28ae1223bd3eedef (patch) | |
| tree | 9cee0c3b2d7f12714da0fa965745428a3b99dd56 /pkgs/build-support | |
| parent | 28fe657e1f16bd2df112ba414a6fcdad8215fc01 (diff) | |
| parent | ffb2d716f483aa9120d155868fb9d600e5eb6b11 (diff) | |
Merge pull request #179187 from mdarocha/eventstore-bump-and-refactor
eventstore: 5.0.8 -> 21.10.5, refactor to use buildDotnetModule
Diffstat (limited to 'pkgs/build-support')
4 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix index 76f7eea5bfeca..5f5916d08b199 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/default.nix @@ -11,6 +11,9 @@ , buildType }: +let + libraryPath = lib.makeLibraryPath runtimeDeps; +in { dotnetConfigureHook = callPackage ({ }: makeSetupHook { @@ -35,7 +38,7 @@ name = "dotnet-check-hook"; deps = [ dotnet-test-sdk ]; substitutions = { - inherit buildType; + inherit buildType libraryPath; disabledTests = lib.optionalString (disabledTests != []) (lib.concatStringsSep "&FullyQualifiedName!=" disabledTests); }; @@ -56,7 +59,7 @@ deps = [ dotnet-runtime makeWrapper ]; substitutions = { dotnetRuntime = dotnet-runtime; - runtimeDeps = lib.makeLibraryPath runtimeDeps; + runtimeDeps = libraryPath; }; } ./dotnet-fixup-hook.sh) { }; } diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh index cd1c401735da8..5a5ece6d99756 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh @@ -25,6 +25,7 @@ dotnetBuildHook() { -p:BuildInParallel=$parallelBuildFlag \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ + -p:UseAppHost=true \ --configuration "@buildType@" \ --no-restore \ ${versionFlag-} \ diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh index 6b3deaa52f96a..bc7b1b5c3d829 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh @@ -11,7 +11,7 @@ dotnetCheckHook() { fi for project in ${testProjectFile[@]}; do - env \ + env "LD_LIBRARY_PATH=@libraryPath@" \ dotnet test "$project" \ -maxcpucount:$maxCpuFlag \ -p:ContinuousIntegrationBuild=true \ diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh index fcd3e7459006e..7984c5ebd3ccb 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh @@ -11,6 +11,7 @@ dotnetInstallHook() { dotnet publish "$project" \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ + -p:UseAppHost=true \ --output "$out/lib/${pname}" \ --configuration "@buildType@" \ --no-build \ |