From af43d707342a2429a40091af98cc90d0fc743c87 Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Mon, 11 Sep 2023 18:43:29 -0400
Subject: [PATCH] parrot and qemu PR's merged

---
 hosts/gerg-desktop/parrot.nix |  4 ++--
 hosts/gerg-desktop/vfio.nix   |  2 --
 packages/parrot.nix           | 45 -----------------------------------
 3 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 packages/parrot.nix

diff --git a/hosts/gerg-desktop/parrot.nix b/hosts/gerg-desktop/parrot.nix
index 7374497..c0f4aa5 100644
--- a/hosts/gerg-desktop/parrot.nix
+++ b/hosts/gerg-desktop/parrot.nix
@@ -1,4 +1,4 @@
-{self, ...}: {
+_: {
   pkgs,
   config,
   lib,
@@ -10,7 +10,7 @@
     wantedBy = ["multi-user.target"];
     wants = ["network-online.target"];
     after = ["network-online.target"];
-    script = lib.getExe self.packages.${pkgs.system}.parrot;
+    script = lib.getExe pkgs.parrot;
     serviceConfig = {
       EnvironmentFile = config.sops.secrets.discordenv.path;
       Restart = "on-failure";
diff --git a/hosts/gerg-desktop/vfio.nix b/hosts/gerg-desktop/vfio.nix
index 165da7a..3880333 100644
--- a/hosts/gerg-desktop/vfio.nix
+++ b/hosts/gerg-desktop/vfio.nix
@@ -88,8 +88,6 @@ in {
                      return;
               '')
             ];
-          buildInputs = old.buildInputs ++ [pkgs.pipewire];
-          configureFlags = old.configureFlags ++ ["--enable-pipewire"];
         });
         runAsRoot = true;
         ovmf.enable = true;
diff --git a/packages/parrot.nix b/packages/parrot.nix
deleted file mode 100644
index d451b26..0000000
--- a/packages/parrot.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  pkg-config,
-  openssl,
-  cmake,
-  libopus,
-  yt-dlp,
-  ffmpeg,
-  makeWrapper,
-}:
-rustPlatform.buildRustPackage
-{
-  pname = "parrot";
-  version = "1.6.0";
-  src = fetchFromGitHub {
-    owner = "aquelemiguel";
-    repo = "parrot";
-    rev = "6b1df01bd9cce1c0d8446dea720c4a32ff935514";
-    hash = "sha256-f6YAdsq2ecsOCvk+A8wsUu+ywQnW//gCAkVLF0HTn8c=";
-  };
-
-  cargoHash = "sha256-e4NHgwoNkZ0//rugHrP0gU3pntaMeBJsV/YSzJfD8r4=";
-
-  nativeBuildInputs = [
-    pkg-config
-    cmake
-    makeWrapper
-  ];
-
-  buildInputs = [
-    libopus
-    openssl
-  ];
-
-  postInstall = ''
-    wrapProgram $out/bin/parrot \
-      --prefix PATH : ${lib.makeBinPath [
-      yt-dlp
-      ffmpeg
-    ]}
-  '';
-  meta.mainProgram = "parrot";
-}