summary refs log tree commit diff
path: root/pkgs/servers/jellyfin
diff options
context:
space:
mode:
authorDavid McFarland <corngood@gmail.com>2022-09-26 14:35:14 -0300
committerDavid McFarland <corngood@gmail.com>2022-12-19 15:36:25 -0400
commit824d40aa0400e547c07c054ed7eddcf42b68955e (patch)
tree27a8d2b43ad4eb455b0b21b85684ebb265106bb2 /pkgs/servers/jellyfin
parent13861970f4ae8d029d6609ece5c31200233d49f4 (diff)
downloadnixpkgs-824d40aa0400e547c07c054ed7eddcf42b68955e.tar
nixpkgs-824d40aa0400e547c07c054ed7eddcf42b68955e.tar.gz
nixpkgs-824d40aa0400e547c07c054ed7eddcf42b68955e.tar.bz2
nixpkgs-824d40aa0400e547c07c054ed7eddcf42b68955e.tar.lz
nixpkgs-824d40aa0400e547c07c054ed7eddcf42b68955e.tar.xz
nixpkgs-824d40aa0400e547c07c054ed7eddcf42b68955e.tar.zst
nixpkgs-824d40aa0400e547c07c054ed7eddcf42b68955e.zip
build-dotnet-module: restore for current runtime by default
Diffstat (limited to 'pkgs/servers/jellyfin')
-rw-r--r--pkgs/servers/jellyfin/default.nix16
1 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix
index 4848dcba9f0..1943d107ad0 100644
--- a/pkgs/servers/jellyfin/default.nix
+++ b/pkgs/servers/jellyfin/default.nix
@@ -12,21 +12,6 @@
 , sqlite
 }:
 
-let
-  os = if stdenv.isDarwin then "osx" else "linux";
-  arch =
-    with stdenv.hostPlatform;
-    if isx86_32 then "x86"
-    else if isx86_64 then "x64"
-    else if isAarch32 then "arm"
-    else if isAarch64 then "arm64"
-    else lib.warn "Unsupported architecture, some image processing features might be unavailable" "unknown";
-  musl = lib.optionalString stdenv.hostPlatform.isMusl
-    (lib.warnIf (arch != "x64") "Some image processing features might be unavailable for non x86-64 with Musl"
-      "musl-");
-  # https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#using-rids
-  runtimeId = "${os}-${musl}${arch}";
-in
 buildDotnetModule rec {
   pname = "jellyfin";
   version = "10.8.8"; # ensure that jellyfin-web has matching version
@@ -57,7 +42,6 @@ buildDotnetModule rec {
   ];
   dotnet-sdk = dotnetCorePackages.sdk_6_0;
   dotnet-runtime = dotnetCorePackages.aspnetcore_6_0;
-  dotnetFlags = [ "--runtime=${runtimeId}" ];
   dotnetBuildFlags = [ "--no-self-contained" ];
 
   preInstall = ''