diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-08 05:59:50 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-08 05:59:50 -0700 |
| commit | c9395e1e92c97889915085ef498841f74317b627 (patch) | |
| tree | 80cb19c11ccc4861589a05791713d22446adf369 /pkgs/build-support | |
| parent | aa5791f7ad9e7da0272eac6d084031d4961c828f (diff) | |
| parent | 3a07187003a144a9214f403a1ba9b4bd14004a2b (diff) | |
| download | nixlib-c9395e1e92c97889915085ef498841f74317b627.tar nixlib-c9395e1e92c97889915085ef498841f74317b627.tar.gz nixlib-c9395e1e92c97889915085ef498841f74317b627.tar.bz2 nixlib-c9395e1e92c97889915085ef498841f74317b627.tar.lz nixlib-c9395e1e92c97889915085ef498841f74317b627.tar.xz nixlib-c9395e1e92c97889915085ef498841f74317b627.tar.zst nixlib-c9395e1e92c97889915085ef498841f74317b627.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/grsecurity/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index e82792be033a..0fd3df6d5f5f 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -33,7 +33,7 @@ let grKernel = if cfg.stable then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_3_19 test-patch; + else mkKernel pkgs.linux_4_0 test-patch; ## -- grsecurity configuration --------------------------------------------- diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index fc41e8ec52ed..838548f94bfe 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -113,6 +113,9 @@ rec { mkdir -p /fs/dev mount -o bind /dev /fs/dev + mkdir -p /fs/dev /fs/dev/shm + mount -t tmpfs -o "mode=1777" none /fs/dev/shm + echo "mounting Nix store..." mkdir -p /fs/nix/store mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose |