diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-02-05 10:13:34 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-02-05 10:13:34 +0100 |
commit | 8627b384af3f88c20ca08c50a01fa27a241d637a (patch) | |
tree | dea3064aa8c19e6cc09b8d0c9dd5b922cb08922c /pkgs/applications | |
parent | dc1638927e41e8bb45dbc98d5560f76e6d88715e (diff) |
treewide: gcc11Stdenv on x86_64-linux -> gcc12Stdenv
These seemed done to upgrade version on aarch64-linux, but now they were (also) downgrading on x86_64-linux. I checked that they still build; some cases were even fixed, e.g.: https://hydra.nixos.org/log/40jmdmnk07ac7xwwxmdqa7smvc3xflm2-qcoro-0.7.0.drv
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/emulators/rpcs3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/plasma-mobile/neochat.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/plasma-mobile/spacebar.nix | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index a97114a07a571..842423ddc18a2 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -1,4 +1,4 @@ -{ gcc11Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git +{ gcc12Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git , qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng , ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers , sdl2Support ? true, SDL2 @@ -21,7 +21,7 @@ let sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz"; }; in -gcc11Stdenv.mkDerivation { +gcc12Stdenv.mkDerivation { pname = "rpcs3"; version = rpcs3Version; diff --git a/pkgs/applications/plasma-mobile/neochat.nix b/pkgs/applications/plasma-mobile/neochat.nix index 2f655d5a9e09c..8b3da82b8b885 100644 --- a/pkgs/applications/plasma-mobile/neochat.nix +++ b/pkgs/applications/plasma-mobile/neochat.nix @@ -1,4 +1,4 @@ -{ gcc11Stdenv +{ gcc12Stdenv , lib , srcs @@ -31,7 +31,7 @@ }: # Workaround for AArch64 not using GCC11 yet. -gcc11Stdenv.mkDerivation rec { +gcc12Stdenv.mkDerivation rec { pname = "neochat"; inherit (srcs.neochat) version src; diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix index 7ec5541f48c8e..0804609083b39 100644 --- a/pkgs/applications/plasma-mobile/spacebar.nix +++ b/pkgs/applications/plasma-mobile/spacebar.nix @@ -1,6 +1,6 @@ { lib , mkDerivation -, gcc11Stdenv +, gcc12Stdenv , srcs , cmake @@ -23,8 +23,8 @@ , qtquickcontrols2 }: -# Workaround for AArch64 not using GCC11 yet. -gcc11Stdenv.mkDerivation rec { +# Workaround for AArch64 still using GCC9. +gcc12Stdenv.mkDerivation rec { pname = "spacebar"; inherit (srcs.spacebar) version src; |