Unverified Commit 6f431f2c authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #230853 from wegank/gcc12-cleanup 

treewide: remove explicit gcc12Stdenv
parents cf4f8bfe 5be2399c

pkgs/applications/editors/imhex/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib

, gcc12Stdenv

, stdenv

, cmake

, llvm

, fetchFromGitHub
@@ -32,7 +32,7 @@ let 
  };



in

gcc12Stdenv.mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "imhex";

  inherit version;

pkgs/applications/emulators/rpcs3/default.nix

+2 −2
Original line number Diff line number Diff line 
{ 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;

pkgs/development/libraries/qcoro/default.nix

+3 −4
Original line number Diff line number Diff line 
{ 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";

pkgs/top-level/all-packages.nix

+2 −7
Original line number Diff line number Diff line
@@ -5115,7 +5115,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 { };















  };









@@ -5124,9 +5123,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 { };
























@@ -21195,9 +21192,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 { };