diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-07 23:51:27 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-08 00:25:04 +0000 |
| commit | 096ca241d9505c265fe46cacec7b316eecb401ad (patch) | |
| tree | 1c4f5daadf7a0f2544ef9b1d219ddcca6867df0d /pkgs/os-specific/linux/chromium-os | |
| parent | 1acfa8ff79fd8895ebc7ca9954830ace0577fff2 (diff) | |
| parent | 5f6df74f66246a2eb198b0bc3fe1f7d2dff57062 (diff) | |
| download | nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.gz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.bz2 nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.lz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.xz nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.tar.zst nixpkgs-096ca241d9505c265fe46cacec7b316eecb401ad.zip | |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/os-specific/linux/chromium-os')
| -rw-r--r-- | pkgs/os-specific/linux/chromium-os/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/chromium-os/libbrillo/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/chromium-os/sommelier/default.nix | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/chromium-os/default.nix b/pkgs/os-specific/linux/chromium-os/default.nix index 6f180d79226..245a59dfad4 100644 --- a/pkgs/os-specific/linux/chromium-os/default.nix +++ b/pkgs/os-specific/linux/chromium-os/default.nix @@ -1,4 +1,4 @@ -{ newScope, fetchFromGitiles, symlinkJoin +{ lib, newScope, fetchFromGitiles, symlinkJoin , linux_4_19, makeLinuxHeaders, modemmanager }: diff --git a/pkgs/os-specific/linux/chromium-os/libbrillo/default.nix b/pkgs/os-specific/linux/chromium-os/libbrillo/default.nix index 511597eea93..b5eda91ffb8 100644 --- a/pkgs/os-specific/linux/chromium-os/libbrillo/default.nix +++ b/pkgs/os-specific/linux/chromium-os/libbrillo/default.nix @@ -17,7 +17,10 @@ common-mk { nativeBuildInputs = [ dbus_cplusplus go-protobuf ]; buildInputs = [ libchrome curl minijail protobuf glib gtest modp_b64 ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=sign-compare" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=sign-compare" + "-Wno-error=stringop-truncation" + ]; postPatch = '' substituteInPlace common-mk/external_dependencies/BUILD.gn \ diff --git a/pkgs/os-specific/linux/chromium-os/sommelier/default.nix b/pkgs/os-specific/linux/chromium-os/sommelier/default.nix index 635d07634c9..599c8dc7d3e 100644 --- a/pkgs/os-specific/linux/chromium-os/sommelier/default.nix +++ b/pkgs/os-specific/linux/chromium-os/sommelier/default.nix @@ -18,6 +18,7 @@ common-mk { NIX_CFLAGS_COMPILE = [ "-Wno-error=sign-compare" + "-Wno-error=stringop-truncation" "-Wno-error=class-memaccess" "-Wno-error=maybe-uninitialized" ]; |