diff options
author | mdarocha <git@mdarocha.pl> | 2023-06-21 17:06:26 +0200 |
---|---|---|
committer | mdarocha <git@mdarocha.pl> | 2023-06-21 17:06:31 +0200 |
commit | 5d71301d0da995d7feb1adf302c0903cbeb3cf80 (patch) | |
tree | a1824af58edff378350a7633760124c9037eb134 /pkgs/applications/audio/tone | |
parent | 521649a9e4068b7297e2bf0191b37918646fca20 (diff) |
tone: remove duplicate settings after buildDotnetModule changes
Also bring back support for non-x86 linux, since crossgen2 works properly now.
Diffstat (limited to 'pkgs/applications/audio/tone')
-rw-r--r-- | pkgs/applications/audio/tone/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/audio/tone/nuget-deps.nix | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/audio/tone/default.nix b/pkgs/applications/audio/tone/default.nix index 230d78ddbfe97..06529a4b02e43 100644 --- a/pkgs/applications/audio/tone/default.nix +++ b/pkgs/applications/audio/tone/default.nix @@ -14,11 +14,9 @@ buildDotnetModule rec { projectFile = "tone/tone.csproj"; executables = [ "tone" ]; nugetDeps = ./nuget-deps.nix; - dotnetBuildFlags = [ "--no-self-contained" ]; + dotnetInstallFlags = [ "-p:PublishSingleFile=false" - "-p:PublishTrimmed=false" - "-p:PublishReadyToRun=false" ]; dotnet-sdk = dotnetCorePackages.sdk_6_0; @@ -29,6 +27,6 @@ buildDotnetModule rec { description = "A cross platform utility to dump and modify audio metadata for a wide variety of formats"; license = licenses.asl20; maintainers = [ maintainers.jvanbruegge ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/tone/nuget-deps.nix b/pkgs/applications/audio/tone/nuget-deps.nix index d5cbfdad364b0..1af0d0ab91acc 100644 --- a/pkgs/applications/audio/tone/nuget-deps.nix +++ b/pkgs/applications/audio/tone/nuget-deps.nix @@ -28,7 +28,6 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.18"; sha256 = "12661jkck5wqwc6cr8vq71lqn7k0jm0q86qxw51a0vph24m77irj"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) (fetchNuGet { pname = "Sandreas.AudioMetadata"; version = "0.1.1"; sha256 = "11ibv23h7qj5qshibmlsqmjca51dqbhib9p1gz66c5kqhk7ci38j"; }) (fetchNuGet { pname = "Sandreas.Files"; version = "1.1.2"; sha256 = "08qk229q2y1dpdxdnp8xi9mgk8fgpjxrxm4z6ak8n09npp67nhn0"; }) |