summary refs log tree commit diff
path: root/pkgs/os-specific/linux/chromium-os/crosvm/default-seccomp-policy-dir.diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-11-24 20:10:38 +0000
committerAlyssa Ross <hi@alyssa.is>2019-12-03 15:16:30 +0000
commit5f9876b29e6fd4e8ae9f0105a5386e932bedf3b6 (patch)
tree86178e84e3333b2f76af61740c5b90cfb961193b /pkgs/os-specific/linux/chromium-os/crosvm/default-seccomp-policy-dir.diff
parent51fe75bdd32fa50b5e1b043957b71faf9260592f (diff)
downloadnixpkgs-5f9876b29e6fd4e8ae9f0105a5386e932bedf3b6.tar
nixpkgs-5f9876b29e6fd4e8ae9f0105a5386e932bedf3b6.tar.gz
nixpkgs-5f9876b29e6fd4e8ae9f0105a5386e932bedf3b6.tar.bz2
nixpkgs-5f9876b29e6fd4e8ae9f0105a5386e932bedf3b6.tar.lz
nixpkgs-5f9876b29e6fd4e8ae9f0105a5386e932bedf3b6.tar.xz
nixpkgs-5f9876b29e6fd4e8ae9f0105a5386e932bedf3b6.tar.zst
nixpkgs-5f9876b29e6fd4e8ae9f0105a5386e932bedf3b6.zip
sommelier: init at 78.12499.0.0-rc1
sommelier has a lot of dependencies on other Chromium OS packages.  To
manage this mess, I introduced chromiumOSPackages to hold them all,
since most of them won't be useful aside from building other
Chromium OS packages, and chromiumOSPackages.common-mk, which is a
wrapper around stdenv to handle interacting with Chromium OS's
idiosyncratic GN-based build system.

I adapted crosvm's updateScript to become the updateScript for all of
chromiumOSPackages, and pulled crosvm under chromiumOSPackages.  This
means that all Chromium OS packages use approximately the same
versions that are distributed as an upstream release.

There are still a couple of Chromium OS packages in Nixpkgs that
aren't part of this set.  Pulling those in is future work.
Diffstat (limited to 'pkgs/os-specific/linux/chromium-os/crosvm/default-seccomp-policy-dir.diff')
-rw-r--r--pkgs/os-specific/linux/chromium-os/crosvm/default-seccomp-policy-dir.diff15
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/chromium-os/crosvm/default-seccomp-policy-dir.diff b/pkgs/os-specific/linux/chromium-os/crosvm/default-seccomp-policy-dir.diff
new file mode 100644
index 00000000000..f1aa50ee102
--- /dev/null
+++ b/pkgs/os-specific/linux/chromium-os/crosvm/default-seccomp-policy-dir.diff
@@ -0,0 +1,15 @@
+diff --git a/src/crosvm.rs b/src/crosvm.rs
+index b7055df..5989c87 100644
+--- a/src/crosvm.rs
++++ b/src/crosvm.rs
+@@ -141,7 +141,9 @@ impl Default for Config {
+             x_display: None,
+             shared_dirs: Vec::new(),
+             sandbox: !cfg!(feature = "default-no-sandbox"),
+-            seccomp_policy_dir: PathBuf::from(SECCOMP_POLICY_DIR),
++            seccomp_policy_dir: PathBuf::from(
++                option_env!("DEFAULT_SECCOMP_POLICY_DIR").unwrap_or(SECCOMP_POLICY_DIR),
++            ),
+             seccomp_log_failures: false,
+             cras_audio: false,
+             cras_capture: false,