Use nixos-unstable & unpin wine version

LovingMelody · Dec 23, 2024 · b62cf22 · b62cf22
1 parent 8b089bf
commit b62cf22
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,8 +2,7 @@
   description = "Nix Flake to simplify running Star Citizen";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
-    nixpkgs-wine.url = "github:NixOS/nixpkgs/03ddbd42cbdfbca5ce5583a8c1b526f36c0d46f3";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nix-gaming = {
       url = "github:fufexan/nix-gaming";
       inputs.nixpkgs.follows = "nixpkgs";

diff --git a/overlays.nix b/overlays.nix
@@ -3,7 +3,6 @@ let
   pins = import ./npins;
   nix-gaming = inputs.nix-gaming.packages.${final.system};
   inherit (inputs.nixpkgs.lib.strings) versionOlder;
-  wine = inputs.nixpkgs-wine.legacyPackages.${prev.system}.wineWowPackages.staging;
 in
 {
   star-citizen-helper = prev.callPackage ./pkgs/star-citizen-helper { };
@@ -30,8 +29,8 @@ in
       if (versionOlder prev.lug-helper.version pkg.version) then pkg else prev.lug-helper
     else
       pkg;
-  star-citizen = nix-gaming.star-citizen.override { inherit wine; };
   inherit (nix-gaming)
+    star-citizen
     star-citizen-umu
     umu
     winetricks-git