From f2df8b7eaf6ef4fa9aec97b3fab04d39fbb11ab6 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Sat, 12 Apr 2025 15:41:33 -0700 Subject: [PATCH] chore: remove unneeded custom packages --- modules/linux/gaming/default.nix | 2 +- pkgs/by-name/modrinth-app-bin/default.nix | 43 ---------------------- pkgs/by-name/rdrview/default.nix | 45 ----------------------- pkgs/default.nix | 2 - 4 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 pkgs/by-name/modrinth-app-bin/default.nix delete mode 100644 pkgs/by-name/rdrview/default.nix diff --git a/modules/linux/gaming/default.nix b/modules/linux/gaming/default.nix index 6bd35c3..a815229 100755 --- a/modules/linux/gaming/default.nix +++ b/modules/linux/gaming/default.nix @@ -44,7 +44,7 @@ in mangojuice r2modman - modrinth-app-bin + modrinth-app # (modrinth-app.overrideAttrs (oldAttrs: { # buildCommand = # '' diff --git a/pkgs/by-name/modrinth-app-bin/default.nix b/pkgs/by-name/modrinth-app-bin/default.nix deleted file mode 100644 index 8cd2ea3..0000000 --- a/pkgs/by-name/modrinth-app-bin/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - appimageTools, - fetchurl, - lib, -}: -let - pname = "ModrinthApp"; - version = "0.9.2"; - src = fetchurl { - url = "https://launcher-files.modrinth.com/versions/${version}/linux/Modrinth%20App_${version}_amd64.AppImage"; - hash = "sha256-lL2FVNeb/IUNFC/BjWNOk3cDIxY2f+eQj0QcnHxwVfw="; - }; - appimageContents = appimageTools.extractType1 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname src version; - - extraInstallCommands = '' - mkdir -p $out/share/applications - mkdir -p $out/share/icons/hicolor/256x256@2/apps - mkdir -p $out/share/icons/hicolor/128x128/apps - - ln -s ${appimageContents}/'Modrinth App.desktop' $out/share/applications - ln -s ${appimageContents}/ModrinthApp.png $out/share/icons/hicolor/256x256@2/apps/ModrinthApp.png - ln -s ${appimageContents}/ModrinthApp.png $out/share/icons/hicolor/128x128/apps/ModrinthApp.png - ''; - - meta = { - description = "Modrinth's game launcher"; - longDescription = '' - A unique, open source launcher that allows you to play your favorite mods, - and keep them up to date, all in one neat little package - ''; - homepage = "https://modrinth.com"; - license = with lib.licenses; [ - gpl3Plus - unfreeRedistributable - ]; - maintainers = with lib.maintainers; [ getchoo ]; - mainProgram = "ModrinthApp"; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/by-name/rdrview/default.nix b/pkgs/by-name/rdrview/default.nix deleted file mode 100644 index 5a45d69..0000000 --- a/pkgs/by-name/rdrview/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - libxml2, - curl, - libseccomp, - installShellFiles, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "rdrview"; - version = "0.1.3"; - - src = fetchFromGitHub { - owner = "eafer"; - repo = "rdrview"; - rev = "v${finalAttrs.version}"; - hash = "sha256-UFHRsaLGa/jv/S+VXtXIMgLuQUPgqbRgD35bBrJyuZA="; - }; - - buildInputs = [ - libxml2 - curl - libseccomp - ]; - nativeBuildInputs = [ installShellFiles ]; - - installPhase = '' - runHook preInstall - install -Dm755 rdrview -t $out/bin - installManPage rdrview.1 - runHook postInstall - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Command line tool to extract main content from a webpage"; - homepage = "https://github.com/eafer/rdrview"; - license = licenses.asl20; - maintainers = with maintainers; [ djanatyn ]; - mainProgram = "rdrview"; - }; -}) diff --git a/pkgs/default.nix b/pkgs/default.nix index 96bce53..a5e085a 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -3,7 +3,5 @@ let inherit (pkgs) callPackage; in final: prev: { - rdrview = callPackage ./by-name/rdrview { }; wine-discord-ipc-bridge = callPackage ./by-name/wine-discord-ipc-bridge { }; - modrinth-app-bin = callPackage ./by-name/modrinth-app-bin { }; }