diff options
author | mdarocha <git@mdarocha.pl> | 2023-09-30 14:27:05 +0200 |
---|---|---|
committer | mdarocha <git@mdarocha.pl> | 2023-10-17 18:59:52 +0200 |
commit | d016404ccd291838794c6e6c1e9ac6779cc5fa9f (patch) | |
tree | e93998d4ea050e42b4932e37ea479a10fd5840e6 /pkgs/build-support | |
parent | f1cc116e3db5cff8b92ec30ec5283de966e22066 (diff) | |
download | nixpkgs-d016404ccd291838794c6e6c1e9ac6779cc5fa9f.tar nixpkgs-d016404ccd291838794c6e6c1e9ac6779cc5fa9f.tar.gz nixpkgs-d016404ccd291838794c6e6c1e9ac6779cc5fa9f.tar.bz2 nixpkgs-d016404ccd291838794c6e6c1e9ac6779cc5fa9f.tar.lz nixpkgs-d016404ccd291838794c6e6c1e9ac6779cc5fa9f.tar.xz nixpkgs-d016404ccd291838794c6e6c1e9ac6779cc5fa9f.tar.zst nixpkgs-d016404ccd291838794c6e6c1e9ac6779cc5fa9f.zip |
buildDotnetModule: parse version before passing it to dotnet
This avoids problems when the Nix version attribute does not fit the format required by .NET
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/dotnet/build-dotnet-module/default.nix | 16 | ||||
-rw-r--r-- | pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh | 9 |
2 files changed, 23 insertions, 2 deletions
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 02776d57c91..f8ed3a38890 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -158,6 +158,22 @@ stdenvNoCC.mkDerivation (args // { dotnet-sdk ]; + # Parse the version attr into a format acceptable for the Version msbuild property + # The actual version attr is saved in InformationalVersion, which accepts an arbitrary string + versionForDotnet = if !(lib.hasAttr "version" args) || args.version == null + then null else let + components = lib.pipe args.version [ + lib.splitVersion + (lib.filter (x: (lib.strings.match "[0-9]+" x) != null)) + (lib.filter (x: (lib.toInt x) < 65535)) # one version component in dotnet has to fit in 16 bits + ]; + in if (lib.length components) == 0 + then null + else lib.concatStringsSep "." ((lib.take 4 components) + ++ (if (lib.length components) < 4 + then lib.replicate (4 - (lib.length components)) "0" + else [ ])); + makeWrapperArgs = args.makeWrapperArgs or [ ] ++ [ "--prefix LD_LIBRARY_PATH : ${dotnet-sdk.icu}/lib" ]; 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 e9567b64cf2..0acfeced9b1 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 @@ -24,8 +24,13 @@ dotnetBuildHook() { dotnetBuildFlags+=("-p:UseAppHost=true") fi + local versionFlags=() if [ "${version-}" ]; then - local -r versionFlag="-p:Version=${version-}" + versionFlags+=("-p:InformationalVersion=${version-}") + fi + + if [ "${versionForDotnet-}" ]; then + versionFlags+=("-p:Version=${versionForDotnet-}") fi dotnetBuild() { @@ -43,7 +48,7 @@ dotnetBuildHook() { -p:Deterministic=true \ --configuration "@buildType@" \ --no-restore \ - ${versionFlag-} \ + ${versionFlags[@]} \ ${runtimeIdFlags[@]} \ ${dotnetBuildFlags[@]} \ ${dotnetFlags[@]} |