Merge pull request #110924 from siraben/stdenv-lib-implicit

treewide: remove implicit use of stdenv.lib
This commit is contained in:
Sandro
2021-01-27 14:56:42 +01:00
committed by GitHub
15 changed files with 35 additions and 42 deletions
+4 -3
View File
@@ -1,10 +1,11 @@
{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc
{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc
, version, hashes }:
with stdenv;
let
inherit (stdenv) hostPlatform;
OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
MODEL = toString hostPlatform.parsed.cpu.bits;
in mkDerivation {
in stdenv.mkDerivation {
pname = "dmd-bootstrap";
inherit version;
+5 -4
View File
@@ -1,10 +1,11 @@
{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2
{ lib, stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2
, version, hashes }:
with stdenv;
let
OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
inherit (stdenv) hostPlatform;
OS = if stdenv.hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name;
ARCH = toString hostPlatform.parsed.cpu.name;
in mkDerivation {
in stdenv.mkDerivation {
pname = "ldc-bootstrap";
inherit version;
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake
{ lib, stdenv, fetchFromGitHub, cmake
, boost, python3, eigen
, icestorm, trellis
, llvmPackages
@@ -12,7 +12,7 @@
let
boostPython = boost.override { python = python3; enablePython = true; };
in
with stdenv; mkDerivation rec {
stdenv.mkDerivation rec {
pname = "nextpnr";
version = "2021.01.02";