dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #51682 from adisbladis/closure-size/cni

Browse Source 
cni/cni-plugins: Remove go references
This commit is contained in:
adisbladis 2018-12-07 22:15:48 +00:00 committed by GitHub
commit 7574d4ef15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/cluster/cni/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, go }: { stdenv, fetchFromGitHub, go, removeReferencesTo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cni-${version}"; name = "cni-${version}";
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y"; sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y";
}; };
buildInputs = [ go ]; buildInputs = [ removeReferencesTo go ];
GOCACHE = "off";
buildPhase = '' buildPhase = ''
patchShebangs build.sh patchShebangs build.sh
@ -23,6 +25,10 @@ stdenv.mkDerivation rec {
mv bin/cnitool $out/bin mv bin/cnitool $out/bin
''; '';
preFixup = ''
find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Container Network Interface - networking for Linux containers"; description = "Container Network Interface - networking for Linux containers";
license = licenses.asl20; license = licenses.asl20;

10
pkgs/applications/networking/cluster/cni/plugins.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, go }: { stdenv, lib, fetchFromGitHub, go, removeReferencesTo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cni-plugins-${version}"; name = "cni-plugins-${version}";
@ -11,7 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2"; sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2";
}; };
buildInputs = [ go ]; buildInputs = [ removeReferencesTo go ];
GOCACHE = "off";
buildPhase = '' buildPhase = ''
patchShebangs build.sh patchShebangs build.sh
@ -23,6 +25,10 @@ stdenv.mkDerivation rec {
mv bin/* $out/bin mv bin/* $out/bin
''; '';
preFixup = ''
find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
'';
meta = with lib; { meta = with lib; {
description = "Some standard networking plugins, maintained by the CNI team"; description = "Some standard networking plugins, maintained by the CNI team";
homepage = https://github.com/containernetworking/plugins; homepage = https://github.com/containernetworking/plugins;