From fbdf49f0973e92e231bdf26ef021cf7d2efab809 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 27 Dec 2025 00:37:16 +0200 Subject: [PATCH] shadps4: remove top-level override --- pkgs/by-name/sh/shadps4/package.nix | 5 +++-- pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/sh/shadps4/package.nix b/pkgs/by-name/sh/shadps4/package.nix index 70ce23705a25..87b323bf5a9a 100644 --- a/pkgs/by-name/sh/shadps4/package.nix +++ b/pkgs/by-name/sh/shadps4/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gcc14Stdenv, fetchFromGitHub, nixosTests, @@ -54,7 +54,8 @@ nix-update-script, }: -stdenv.mkDerivation (finalAttrs: { +# relies on std::sinf & co, which was broken in GCC until GCC 14: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79700 +gcc14Stdenv.mkDerivation (finalAttrs: { pname = "shadps4"; version = "0.13.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cfb0c2a119b..25fa1f6b9e6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1315,11 +1315,6 @@ with pkgs; withWayland = true; }; - shadps4 = callPackage ../by-name/sh/shadps4/package.nix { - # relies on std::sinf & co, which was broken in GCC until GCC 14: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79700 - stdenv = gcc14Stdenv; - }; - winetricks = callPackage ../applications/emulators/wine/winetricks.nix { }; zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { };