Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6cfb2c8ebc9d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8084edb11c53
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 19, 2020

  1. terraform: fix /bin/stty reference (#85560)

    @marsam
    marsam authored Apr 19, 2020
    Copy the full SHA
    8084edb View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 pkgs/applications/networking/cluster/terraform/default.nix
8 changes: 7 additions & 1 deletion pkgs/applications/networking/cluster/terraform/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper
{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils
, runCommand, writeText, terraform-providers }:

let
@@ -18,6 +18,12 @@ let
inherit sha256;
};

postPatch = ''
# speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22
substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \
--replace "/bin/stty" "${coreutils}/bin/stty"
'';

postInstall = ''
# remove all plugins, they are part of the main binary now
for i in $bin/bin/*; do