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

openshift: use go instead of go_1_10 

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2018-11-12 18:17:33 +01:00
parent 1ccea556a1
commit 37b50c08eb
No known key found for this signature in database
GPG Key ID: 083CC6FD6EB699A3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/cluster/openshift/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_10, go-bindata, makeWrapper, rsync, utillinux { stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync, utillinux
, coreutils, kerberos, clang , coreutils, kerberos, clang
, components ? [ , components ? [
"cmd/oc" "cmd/oc"
@ -32,8 +32,8 @@ in stdenv.mkDerivation rec {
}; };
# go > 1.10 # go > 1.10
# [FATAL] [14:44:02+0000] Please install Go version go1.10 or use PERMISSIVE_GO=y to bypass this check. # [FATAL] [14:44:02+0000] Please install Go version go or use PERMISSIVE_GO=y to bypass this check.
buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata kerberos clang ]; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata kerberos clang ];
outputs = [ "out" ]; outputs = [ "out" ];
@ -78,7 +78,7 @@ in stdenv.mkDerivation rec {
''; '';
preFixup = '' preFixup = ''
find $out/bin -type f -exec remove-references-to -t ${go_1_10} '{}' + find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {