From 2277579c3884c0fe5929c4e35e3de41dd0bcdd92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 23 Aug 2024 07:07:06 -0400 Subject: [PATCH] vinegar: remove --- pkgs/by-name/vi/vinegar/package.nix | 103 ---------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 pkgs/by-name/vi/vinegar/package.nix diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix deleted file mode 100644 index a3f54e3e7312..000000000000 --- a/pkgs/by-name/vi/vinegar/package.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, makeBinaryWrapper -, pkg-config -, libGL -, libxkbcommon -, xorg -, wayland -, vulkan-headers -, wine64Packages -, fetchpatch -, fetchFromGitLab -, fetchurl -, -}: -let - stagingPatch = fetchFromGitLab { - sha256 = "sha256-VQ4j4PuXRoXbCUZ16snVO+jRvuKD4Rjn14R7bhwdAco="; - domain = "gitlab.winehq.org"; - owner = "wine"; - repo = "wine-staging"; - rev = "v9.2"; - }; - - wine = wine64Packages.staging.overrideDerivation (oldAttrs: { - prePatch = '' - patchShebangs tools - cp -r ${stagingPatch}/patches ${stagingPatch}/staging . - chmod +w patches - patchShebangs ./patches/gitapply.sh - python3 ./staging/patchinstall.py --destdir="$PWD" --all - ''; - patches = (oldAttrs.patches or [ ]) - ++ [ - (fetchurl { - name = "childwindow.patch"; - hash = "sha256-u3mDvlbhQnfh2tUKb8jNJA0tTcLIaKVLfY8ktJmeRns="; - url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/9f43ce33a691afb50562d95adfc6719a3b58ddb7/patches/wine/childwindow.patch"; - }) - (fetchpatch { - name = "mouselock.patch"; - hash = "sha256-0AGA4AQbxTL5BGVbm072moav7xVA3zpotYqM8pcEDa4="; - url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/9f43ce33a691afb50562d95adfc6719a3b58ddb7/patches/wine/mouselock.patch"; - }) - (fetchpatch { - name = "segregrevert.patch"; - hash = "sha256-+3Nld81nG3GufI4jAF6yrWfkJmsSCOku39rx0Hov29c="; - url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/9f43ce33a691afb50562d95adfc6719a3b58ddb7/patches/wine/segregrevert.patch"; - }) - ]; - src = fetchFromGitLab rec { - sha256 = "sha256-GlPH34dr9aHx7xvlcbtDMn/wrY//DP58ilXjhQXgihQ="; - domain = "gitlab.winehq.org"; - owner = "wine"; - repo = "wine"; - rev = "wine-9.2"; - }; - }); -in -buildGoModule rec { - pname = "vinegar"; - version = "1.7.5"; - - src = fetchFromGitHub { - owner = "vinegarhq"; - repo = "vinegar"; - rev = "v${version}"; - hash = "sha256-eU6xlmgz8X7q51GSkQlz/kEQgTzzXYw5P6Yr47f7hbs="; - }; - - vendorHash = "sha256-O2AQFcJmYY3FtLXB3BPdzsplFbthYEyasfctpPOQVhs="; - - nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; - buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wayland vulkan-headers wine ]; - - buildPhase = '' - runHook preBuild - make PREFIX=$out - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - make PREFIX=$out install - runHook postInstall - ''; - - postInstall = '' - wrapProgram $out/bin/vinegar \ - --prefix PATH : ${lib.makeBinPath [wine]} - ''; - - meta = with lib; { - description = "Open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux"; - homepage = "https://github.com/vinegarhq/vinegar"; - changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}"; - mainProgram = "vinegar"; - license = licenses.gpl3Only; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ nyanbinary ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 78376c6b6752..9047b4aa5620 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1548,6 +1548,7 @@ mapAliases ({ vikunja-frontend = throw "'vikunja-frontend' has been replaced by 'vikunja'"; # Added 2024-02-19 vimHugeX = vim-full; # Added 2022-12-04 vim_configurable = vim-full; # Added 2022-12-04 + vinegar = throw "'vinegar' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23 virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 virtmanager-qt = throw "'virtmanager-qt' has been renamed to/replaced by 'virt-manager-qt'"; # Converted to throw 2023-09-10 vivaldi-widevine = throw "'vivaldi-widevine' has been renamed to/replaced by 'widevine-cdm'"; # Added 2023-02-25