Merge pull request #62553 from matthewbauer/ghc-patch-shebangs

ghc: add bash to buildInputs
This commit is contained in:
Matthew Bauer 2019-06-03 20:13:14 -04:00 committed by GitHub
commit 84e34cbde2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 6 deletions

View File

@ -3,6 +3,7 @@
# build-tools
, bootPkgs
, autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx
, bash
, runCommand
, libiconv ? null, ncurses
@ -218,7 +219,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = [ perl ] ++ (libDeps hostPlatform);
buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;

View File

@ -3,6 +3,7 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
, bash
, libiconv ? null, ncurses
@ -195,7 +196,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = [ perl ] ++ (libDeps hostPlatform);
buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;

View File

@ -3,6 +3,7 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
, bash
, libiconv ? null, ncurses
@ -194,7 +195,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = [ perl ] ++ (libDeps hostPlatform);
buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;

View File

@ -3,6 +3,7 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
, bash
, libiconv ? null, ncurses
@ -194,7 +195,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = [ perl ] ++ (libDeps hostPlatform);
buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;

View File

@ -3,6 +3,7 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
, bash
, libiconv ? null, ncurses
@ -179,7 +180,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = [ perl ] ++ (libDeps hostPlatform);
buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;

View File

@ -3,6 +3,7 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchgit, fetchurl, fetchpatch, perl, python3, m4, sphinx
, bash
, libiconv ? null, ncurses
@ -177,7 +178,7 @@ stdenv.mkDerivation (rec {
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = [ perl ] ++ (libDeps hostPlatform);
buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ stdenv.lib.optional useLLVM llvmPackages.llvm;