diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-07 06:01:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-07 06:01:00 +0000 |
| commit | 32d842483f3773ec1cde181507bd77b405af046e (patch) | |
| tree | 351a44c8193a79dff8e8c8ae6db284c21d17844b /pkgs/build-support | |
| parent | fd7a8aedb05d043f27206beaf915d1f9397396cf (diff) | |
| parent | 26a318452796c13502a1b3ec4aa2c352e8d15bbf (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/appimage/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/dotnet/build-dotnet-module/default.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 7b9bb239402bc..078570ec7aea3 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -173,6 +173,7 @@ rec { libpulseaudio libsamplerate libmikmod + libthai libtheora libtiff pixman diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index f8ed3a38890c3..573b270ee408f 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -165,7 +165,7 @@ stdenvNoCC.mkDerivation (args // { 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 + (lib.filter (x: (lib.toIntBase10 x) < 65535)) # one version component in dotnet has to fit in 16 bits ]; in if (lib.length components) == 0 then null |