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 | |
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')
-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 | ||||
-rw-r--r-- | pkgs/development/libraries/qcoro/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
5 files changed, 14 insertions, 14 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; diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix index 4a288702e2f29..fb5c7570b75ba 100644 --- a/pkgs/development/libraries/qcoro/default.nix +++ b/pkgs/development/libraries/qcoro/default.nix @@ -1,5 +1,5 @@ { stdenv -, gcc11Stdenv +, gcc12Stdenv , lib , fetchFromGitHub , cmake @@ -9,7 +9,7 @@ , wrapQtAppsHook }: -gcc11Stdenv.mkDerivation rec { +gcc12Stdenv.mkDerivation rec { pname = "qcoro"; version = "0.7.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 199165d210b4d..b63cb8c1627d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4898,11 +4898,11 @@ with pkgs; }; hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { - stdenv = gcc11Stdenv; + stdenv = gcc12Stdenv; }; hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { - stdenv = gcc11Stdenv; + stdenv = gcc12Stdenv; }; hysteria = callPackage ../tools/networking/hysteria { }; @@ -20542,7 +20542,7 @@ with pkgs; lmdbxx = callPackage ../development/libraries/lmdbxx { }; lemon-graph = callPackage ../development/libraries/lemon-graph { - stdenv = if stdenv.isLinux then gcc11Stdenv else stdenv; + stdenv = if stdenv.isLinux then gcc12Stdenv else stdenv; }; levmar = callPackage ../development/libraries/levmar { }; @@ -25757,7 +25757,7 @@ with pkgs; }; btop = callPackage ../tools/system/btop { - stdenv = gcc11Stdenv; + stdenv = gcc12Stdenv; }; nmon = callPackage ../os-specific/linux/nmon { }; @@ -30779,7 +30779,7 @@ with pkgs; ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { # https://github.com/NixOS/nixpkgs/issues/201254 - stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv; + stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc12Stdenv; }; lazpaint = callPackage ../applications/graphics/lazpaint { }; |