diff options
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/libbrillo/0007-libbrillo-fix-build-with-relative-platform2_root.patch')
-rw-r--r-- | pkgs/os-specific/linux/chromium-os/libbrillo/0007-libbrillo-fix-build-with-relative-platform2_root.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/chromium-os/libbrillo/0007-libbrillo-fix-build-with-relative-platform2_root.patch b/pkgs/os-specific/linux/chromium-os/libbrillo/0007-libbrillo-fix-build-with-relative-platform2_root.patch new file mode 100644 index 00000000000..c476c812450 --- /dev/null +++ b/pkgs/os-specific/linux/chromium-os/libbrillo/0007-libbrillo-fix-build-with-relative-platform2_root.patch @@ -0,0 +1,26 @@ +From 16960cbb59804aebc4b7dd5f746d2452c8a1edd0 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross <hi@alyssa.is> +Date: Sun, 1 Dec 2019 22:11:39 +0000 +Subject: [PATCH 07/10] libbrillo: fix build with relative platform2_root + +--- + libbrillo/BUILD.gn | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libbrillo/BUILD.gn b/libbrillo/BUILD.gn +index e475692ab..c3ca0054b 100644 +--- a/libbrillo/BUILD.gn ++++ b/libbrillo/BUILD.gn +@@ -355,7 +355,8 @@ shared_library("libpolicy-${libbase_ver}") { + "openssl", + "protobuf-lite", + ] +- ldflags = [ "-Wl,--version-script,${platform2_root}/libbrillo/libpolicy.ver" ] ++ libpolicy_ver = rebase_path("//libbrillo/libpolicy.ver") ++ ldflags = [ "-Wl,--version-script,${libpolicy_ver}" ] + sources = [ + "policy/device_policy.cc", + "policy/device_policy_impl.cc", +-- +2.23.0 + |