diff options
| author | Domen Kožar <domen@dev.si> | 2015-08-27 13:22:29 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-08-27 13:22:29 +0200 |
| commit | e65fce3af64ea0b2058a69d72bc74a0baa756bf9 (patch) | |
| tree | f787124dfcef8e2e57dff7b48d3081f97dd538c9 /pkgs/applications/virtualization | |
| parent | 03921972268934d900cc32dad253ff383926771c (diff) | |
| download | nixlib-e65fce3af64ea0b2058a69d72bc74a0baa756bf9.tar nixlib-e65fce3af64ea0b2058a69d72bc74a0baa756bf9.tar.gz nixlib-e65fce3af64ea0b2058a69d72bc74a0baa756bf9.tar.bz2 nixlib-e65fce3af64ea0b2058a69d72bc74a0baa756bf9.tar.lz nixlib-e65fce3af64ea0b2058a69d72bc74a0baa756bf9.tar.xz nixlib-e65fce3af64ea0b2058a69d72bc74a0baa756bf9.tar.zst nixlib-e65fce3af64ea0b2058a69d72bc74a0baa756bf9.zip | |
docker: fix build on i686
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index b915e744358c..6ad59a087e9f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper, btrfsProgs, iptables, bash, e2fsprogs, xz}: +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md + stdenv.mkDerivation rec { name = "docker-${version}"; version = "1.8.1"; @@ -16,6 +18,11 @@ stdenv.mkDerivation rec { 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 = '' patchShebangs . export AUTO_GOPATH=1 |