fix vst shell

6 files changed, 3 insertions, 36 deletions

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 2187e6f..f2bd7c6 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -10,18 +10,11 @@
         ../options.nix
       ];
     }).config;
-in rec {
+in {
   arcanist = pkgs.callPackage ./arcanist {};
   astal = pkgs.callPackage ./astal {
     inherit inputs options;
   };
   libfprint-2-tod1-vfs0090 = pkgs.callPackage ./libfprint-2-tod1-vfs0090 {};
   solaar-udev-rules = pkgs.callPackage ./solaar-udev-rules {};
-  wine-wow-yabridge = pkgs.callPackage ./wine-wow-yabridge {};
-  yabridge = pkgs.callPackage ./yabridge {
-    wine = wine-wow-yabridge;
-  };
-  yabridgectl = pkgs.callPackage ./yabridgectl {
-    wine = wine-wow-yabridge;
-  };
 }
diff --git a/pkgs/wine-wow-yabridge/default.nix b/pkgs/wine-wow-yabridge/default.nix
deleted file mode 100644
index f3346a3..0000000
--- a/pkgs/wine-wow-yabridge/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{wineWowPackages}:
-wineWowPackages.yabridge.overrideAttrs (finalAttrs: {
-  NIX_CFLAGS_COMPILE =
-    (finalAttrs.NIX_CFLAGS_COMPILE or "")
-    + "-std=gnu17";
-})
diff --git a/pkgs/yabridge/default.nix b/pkgs/yabridge/default.nix
deleted file mode 100644
index 97a49db..0000000
--- a/pkgs/yabridge/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  yabridge,
-  wine,
-}:
-yabridge.override {
-  inherit wine;
-}
diff --git a/pkgs/yabridgectl/default.nix b/pkgs/yabridgectl/default.nix
deleted file mode 100644
index 4f3e7a8..0000000
--- a/pkgs/yabridgectl/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  yabridgectl,
-  wine,
-}:
-yabridgectl.override {
-  inherit wine;
-}
diff --git a/shells/default.nix b/shells/default.nix
index 8bc7548..22a7ee3 100644
--- a/shells/default.nix
+++ b/shells/default.nix
@@ -31,6 +31,5 @@
       config.allowUnfree = true;
     };
     lib = inputs.nixpkgs.lib;
-    inherit system inputs;
   });
 }
diff --git a/shells/vst.nix b/shells/vst.nix
index a0c1694..3ba3326 100644
--- a/shells/vst.nix
+++ b/shells/vst.nix
@@ -1,12 +1,7 @@
 {
   pkgs,
   lib,
-  inputs,
-  system,
 }: let
-  wine = inputs.self.packages.${system}.wine-wow-yabridge;
-  yabridge = inputs.self.packages.${system}.yabridge;
-  yabridgectl = inputs.self.packages.${system}.yabridgectl;
   libs = with pkgs; [
     # fix missing libs
     gcc-unwrapped
@@ -16,7 +11,7 @@
     pipewire
     pulseaudio
     # yabridge
-    wine
+    wineWowPackages.yabridge
     yabridge
     yabridgectl
   ];
@@ -31,6 +26,6 @@ in {
 
   shellHook = ''
     export WINEPREFIX="$XDG_DATA_HOME/vst_wine";
-    export NIX_PROFILES="$NIX_PROFILES ${yabridge}";
+    export NIX_PROFILES="$NIX_PROFILES ${pkgs.yabridge}";
   '';
 }