diff --git a/pkgs/applications/editors/imhex/default.nix b/pkgs/applications/editors/imhex/default.nix index 810bd12cd20..4d966a26fd8 100644 --- a/pkgs/applications/editors/imhex/default.nix +++ b/pkgs/applications/editors/imhex/default.nix @@ -1,5 +1,5 @@ { lib -, gcc12Stdenv +, stdenv , cmake , llvm , fetchFromGitHub @@ -32,7 +32,7 @@ let }; in -gcc12Stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "imhex"; inherit version; diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 6d62db43949..45c5bc642ae 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -1,4 +1,4 @@ -{ gcc12Stdenv, lib, fetchFromGitHub, wrapQtAppsHook, cmake, pkg-config, git +{ lib, stdenv, 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 -gcc12Stdenv.mkDerivation { +stdenv.mkDerivation { pname = "rpcs3"; version = rpcs3Version; diff --git a/pkgs/development/libraries/qcoro/default.nix b/pkgs/development/libraries/qcoro/default.nix index 2de82f9c0c8..96cf2cd6fc8 100644 --- a/pkgs/development/libraries/qcoro/default.nix +++ b/pkgs/development/libraries/qcoro/default.nix @@ -1,6 +1,5 @@ -{ stdenv -, gcc12Stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , cmake , libpthreadstubs @@ -9,7 +8,7 @@ , wrapQtAppsHook }: -gcc12Stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "qcoro"; version = "0.9.0"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 218711f3c59..569af37c464 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5117,7 +5117,6 @@ with pkgs; cairo = cairo.override { xcbSupport = true; }; }; hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { - stdenv = gcc12Stdenv; wlroots = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; udis86 = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; }; @@ -5126,9 +5125,7 @@ with pkgs; hyprland-share-picker = libsForQt5.callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix { }; - hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { - stdenv = gcc12Stdenv; - }; + hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { }; @@ -21185,9 +21182,7 @@ with pkgs; lmdbxx = callPackage ../development/libraries/lmdbxx { }; - lemon-graph = callPackage ../development/libraries/lemon-graph { - stdenv = if stdenv.isLinux then gcc12Stdenv else stdenv; - }; + lemon-graph = callPackage ../development/libraries/lemon-graph { }; levmar = callPackage ../development/libraries/levmar { };