cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

treewide: remove explicit gcc12Stdenv

Browse source
This commit is contained in:
Weijia Wang 2023-05-09 13:27:05 +03:00
parent 443a8f398a
commit 5be2399cf5
4 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/imhex/default.nix
View file

@ -1,5 +1,5 @@
{ lib { lib
, gcc12Stdenv , stdenv
, cmake , cmake
, llvm , llvm
, fetchFromGitHub , fetchFromGitHub
@ -32,7 +32,7 @@ let
}; };
in in
gcc12Stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "imhex"; pname = "imhex";
inherit version; inherit version;

4
pkgs/applications/emulators/rpcs3/default.nix
View file

@ -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 , qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng
, ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers , ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers
, sdl2Support ? true, SDL2 , sdl2Support ? true, SDL2
@ -21,7 +21,7 @@ let
sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz"; sha256 = "0c3g30rj1y8fbd2q4kwlpg1jdy02z4w5ryhj3yr9051pdnf4kndz";
}; };
in in
gcc12Stdenv.mkDerivation { stdenv.mkDerivation {
pname = "rpcs3"; pname = "rpcs3";
version = rpcs3Version; version = rpcs3Version;

7
pkgs/development/libraries/qcoro/default.nix
View file

@ -1,6 +1,5 @@
{ stdenv { lib
, gcc12Stdenv , stdenv
, lib
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, libpthreadstubs , libpthreadstubs
@ -9,7 +8,7 @@
, wrapQtAppsHook , wrapQtAppsHook
}: }:
gcc12Stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "qcoro"; pname = "qcoro";
version = "0.9.0"; version = "0.9.0";

9
pkgs/top-level/all-packages.nix
View file

@ -5117,7 +5117,6 @@ with pkgs;
cairo = cairo.override { xcbSupport = true; }; }; cairo = cairo.override { xcbSupport = true; }; };
hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { hyprland = callPackage ../applications/window-managers/hyprwm/hyprland {
stdenv = gcc12Stdenv;
wlroots = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; wlroots = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { };
udis86 = pkgs.callPackage ../applications/window-managers/hyprwm/hyprland/udis86.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 { }; hyprland-share-picker = libsForQt5.callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix { };
hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { };
stdenv = gcc12Stdenv;
};
hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { }; hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { };
@ -21185,9 +21182,7 @@ with pkgs;
lmdbxx = callPackage ../development/libraries/lmdbxx { }; lmdbxx = callPackage ../development/libraries/lmdbxx { };
lemon-graph = callPackage ../development/libraries/lemon-graph { lemon-graph = callPackage ../development/libraries/lemon-graph { };
stdenv = if stdenv.isLinux then gcc12Stdenv else stdenv;
};
levmar = callPackage ../development/libraries/levmar { }; levmar = callPackage ../development/libraries/levmar { };