From d154dc37e5a1179def36813fee1016a764090535 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Tue, 20 Feb 2024 14:45:01 +0200 Subject: [PATCH] pkgs/wine: drop unused wayland flags Reason: https://github.com/NixOS/nixpkgs/pull/286580 --- flake.lock | 6 +++--- pkgs/wine/default.nix | 4 +--- pkgs/wine/supportFlags.nix | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index cca4201b..73a02068 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708151420, - "narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=", + "lastModified": 1708407374, + "narHash": "sha256-EECzarm+uqnNDCwaGg/ppXCO11qibZ1iigORShkkDf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e2f00c83911461438301db0dba5281197fe4b3a", + "rev": "f33dd27a47ebdf11dc8a5eb05e7c8fbdaf89e73f", "type": "github" }, "original": { diff --git a/pkgs/wine/default.nix b/pkgs/wine/default.nix index b54bec4a..8e8291df 100644 --- a/pkgs/wine/default.nix +++ b/pkgs/wine/default.nix @@ -38,7 +38,7 @@ pkgArches = [pkgs pkgsi686Linux]; platforms = ["x86_64-linux"]; stdenv = stdenv_32bit; - wineRelease = ""; + wineRelease = "unstable"; }; pnameGen = n: n + lib.optionalString (build == "full") "-full"; @@ -59,8 +59,6 @@ in { pname = pnameGen "wine-tkg"; version = lib.removeSuffix "\n" (lib.removePrefix "Wine version " (builtins.readFile "${src}/VERSION")); src = pins.wine-tkg; - supportFlags.waylandSupport = true; - wineRelease = "wayland"; }); wine-osu = let diff --git a/pkgs/wine/supportFlags.nix b/pkgs/wine/supportFlags.nix index 7178f82f..1be59f6e 100644 --- a/pkgs/wine/supportFlags.nix +++ b/pkgs/wine/supportFlags.nix @@ -29,7 +29,6 @@ rec { krb5Support = false; embedInstallers = false; x11Support = true; - waylandSupport = false; usbSupport = true; };