diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-27 14:56:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-27 14:56:42 +0100 |
| commit | 2e442062f4e54fb3c41ba1784eb0660cbeea0a1b (patch) | |
| tree | 557fd816fc22d0bebff4354d90f41b9cf05a999d /pkgs/development/compilers | |
| parent | 18e2e99cc2dca9dc24db7e95fad23b1fc3ca2d7e (diff) | |
| parent | 82454e9df8d54c5afaa23055b4fbc656e347c71e (diff) | |
Merge pull request #110924 from siraben/stdenv-lib-implicit
treewide: remove implicit use of stdenv.lib
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/dmd/binary.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/compilers/ldc/binary.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/nextpnr/default.nix | 4 |
3 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/development/compilers/dmd/binary.nix b/pkgs/development/compilers/dmd/binary.nix index 2ff2b35060b8..de0964155fcb 100644 --- a/pkgs/development/compilers/dmd/binary.nix +++ b/pkgs/development/compilers/dmd/binary.nix @@ -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; diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix index cbdb56efb17f..3a07009296a8 100644 --- a/pkgs/development/compilers/ldc/binary.nix +++ b/pkgs/development/compilers/ldc/binary.nix @@ -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; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index ebb6db31d5d1..efb299854525 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -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"; |