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

docker: fix build on i686

Browse Source
This commit is contained in:
Domen Kožar 2015-08-27 13:22:29 +02:00
parent 0392197226
commit e65fce3af6
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/virtualization/docker/default.nix
View File

@ -1,6 +1,8 @@
{ stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper, { stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper,
btrfsProgs, iptables, bash, e2fsprogs, xz}: btrfsProgs, iptables, bash, e2fsprogs, xz}:
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "docker-${version}"; name = "docker-${version}";
version = "1.8.1"; version = "1.8.1";
@ -16,6 +18,11 @@ stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
preConfigure = ''
mv vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/{jump_amd64.go,jump_linux.go}
sed -i 's/,amd64//' vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/jump_linux.go
'';
buildPhase = '' buildPhase = ''
patchShebangs . patchShebangs .
export AUTO_GOPATH=1 export AUTO_GOPATH=1