From 82c1517ecf9d2bbbf14a18b73e7cdc19ca0ba605 Mon Sep 17 00:00:00 2001 From: bandithedoge Date: Sat, 14 Feb 2026 07:17:55 +0100 Subject: [PATCH] dorion: use shelter from nixpkgs --- pkgs/by-name/do/dorion/package.nix | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index c184d89ca1fc..8c6292e26396 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchurl, rustPlatform, cmake, ninja, @@ -25,22 +24,14 @@ pipewire, apple-sdk_15, darwin, + shelter, + nix-update-script, }: let webkitgtk_4_1' = webkitgtk_4_1.override { enableExperimental = true; }; - - shelter = fetchurl { - url = "https://raw.githubusercontent.com/uwu/shelter-builds/7a1beaff4bb4ec5e8590d069549686fda4200e82/shelter.js"; - hash = "sha256-LeZTxrGRQb0rl3BMP34UFHIEFnil4k3Fet3MTujvVB8="; - meta = { - homepage = "https://github.com/uwu/shelter"; - sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; # actually, minified JS - license = lib.licenses.cc0; - }; - }; in rustPlatform.buildRustPackage (finalAttrs: { pname = "dorion"; @@ -124,7 +115,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ' src-tauri/tauri.conf.json # link shelter injection - ln -s "${shelter}" src-tauri/injection/shelter.js + ln -s ${shelter}/shelter.js src-tauri/injection/shelter.js # link html/frontend data ln -s "$(pwd)/src" src-tauri/html @@ -192,6 +183,8 @@ rustPlatform.buildRustPackage (finalAttrs: { TAURI_RESOURCE_DIR = "${placeholder "out"}/lib"; }; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://spikehd.github.io/projects/dorion/"; description = "Tiny alternative Discord client"; @@ -201,10 +194,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; changelog = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}"; downloadPage = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}"; - license = [ - lib.licenses.gpl3Only - shelter.meta.license - ]; + license = lib.licenses.gpl3Only; mainProgram = "Dorion"; maintainers = with lib.maintainers; [ nyabinary @@ -214,7 +204,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; platforms = lib.platforms.unix; sourceProvenance = [ - lib.sourceTypes.binaryBytecode # actually, minified JS lib.sourceTypes.fromSource ]; };