public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #110912 from siraben/stdenv-lib-inherit

Browse Source 
treewide: remove inherited stdenv.lib
This commit is contained in:
Sandro
2021-01-27 10:28:55 +01:00
committed by GitHub
parent 2ee93d61ad 3bbad8b041
commit ad97ca4e51
32 changed files with 37 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/gcc/10/default.nix
+1 -1
View File
@@ -245,7 +245,7 @@ stdenv.mkDerivation ({
inherit
(import ../common/extra-target-flags.nix {
inherit stdenv crossStageStatic libcCross threadsCross;
inherit lib stdenv crossStageStatic libcCross threadsCross;
})
EXTRA_FLAGS_FOR_TARGET
EXTRA_LDFLAGS_FOR_TARGET
pkgs/development/compilers/gcc/4.8/default.nix
+1 -1
View File
@@ -271,7 +271,7 @@ stdenv.mkDerivation ({
inherit
(import ../common/extra-target-flags.nix {
inherit stdenv crossStageStatic libcCross threadsCross;
inherit lib stdenv crossStageStatic libcCross threadsCross;
})
EXTRA_FLAGS_FOR_TARGET
EXTRA_LDFLAGS_FOR_TARGET
pkgs/development/compilers/gcc/4.9/default.nix
+1 -1
View File
@@ -284,7 +284,7 @@ stdenv.mkDerivation ({
inherit
(import ../common/extra-target-flags.nix {
inherit stdenv crossStageStatic libcCross threadsCross;
inherit lib stdenv crossStageStatic libcCross threadsCross;
})
EXTRA_FLAGS_FOR_TARGET
EXTRA_LDFLAGS_FOR_TARGET
pkgs/development/compilers/gcc/6/default.nix
+1 -1
View File
@@ -303,7 +303,7 @@ stdenv.mkDerivation ({
inherit
(import ../common/extra-target-flags.nix {
inherit stdenv crossStageStatic libcCross threadsCross;
inherit lib stdenv crossStageStatic libcCross threadsCross;
})
EXTRA_FLAGS_FOR_TARGET
EXTRA_LDFLAGS_FOR_TARGET
pkgs/development/compilers/gcc/7/default.nix
+1 -1
View File
@@ -255,7 +255,7 @@ stdenv.mkDerivation ({
inherit
(import ../common/extra-target-flags.nix {
inherit stdenv crossStageStatic libcCross threadsCross;
inherit lib stdenv crossStageStatic libcCross threadsCross;
})
EXTRA_FLAGS_FOR_TARGET
EXTRA_LDFLAGS_FOR_TARGET
pkgs/development/compilers/gcc/8/default.nix
+1 -1
View File
@@ -240,7 +240,7 @@ stdenv.mkDerivation ({
inherit
(import ../common/extra-target-flags.nix {
inherit stdenv crossStageStatic libcCross threadsCross;
inherit lib stdenv crossStageStatic libcCross threadsCross;
})
EXTRA_FLAGS_FOR_TARGET
EXTRA_LDFLAGS_FOR_TARGET
pkgs/development/compilers/gcc/9/default.nix
+1 -1
View File
@@ -259,7 +259,7 @@ stdenv.mkDerivation ({
inherit
(import ../common/extra-target-flags.nix {
inherit stdenv crossStageStatic langD libcCross threadsCross;
inherit lib stdenv crossStageStatic langD libcCross threadsCross;
})
EXTRA_FLAGS_FOR_TARGET
EXTRA_LDFLAGS_FOR_TARGET
pkgs/development/compilers/gcc/common/configure-flags.nix
+1 -2
View File
@@ -39,8 +39,7 @@ assert langJava -> lib.versionOlder version "7";
let
inherit (stdenv)
buildPlatform hostPlatform targetPlatform
lib;
buildPlatform hostPlatform targetPlatform;
crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
pkgs/development/compilers/gcc/common/extra-target-flags.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }:
{ lib, stdenv, crossStageStatic, langD ? false, libcCross, threadsCross }:
let
inherit (stdenv) lib hostPlatform targetPlatform;
inherit (stdenv) hostPlatform targetPlatform;
in
{