diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-23 18:01:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-23 18:01:34 +0000 |
| commit | cfc5c35a0b39f3dc4ab73c2e4cd12191eb4ebe09 (patch) | |
| tree | 06ac2f03aaca47752e89f29be06da2af2aec4aba /pkgs/os-specific | |
| parent | d6db8fa53b8d5707d9245a3c5131826d7e702fa5 (diff) | |
| parent | b67dbe0ff1a6378a8c6cc3f32cfdddd7a8c4a3be (diff) | |
| download | nixlib-cfc5c35a0b39f3dc4ab73c2e4cd12191eb4ebe09.tar nixlib-cfc5c35a0b39f3dc4ab73c2e4cd12191eb4ebe09.tar.gz nixlib-cfc5c35a0b39f3dc4ab73c2e4cd12191eb4ebe09.tar.bz2 nixlib-cfc5c35a0b39f3dc4ab73c2e4cd12191eb4ebe09.tar.lz nixlib-cfc5c35a0b39f3dc4ab73c2e4cd12191eb4ebe09.tar.xz nixlib-cfc5c35a0b39f3dc4ab73c2e4cd12191eb4ebe09.tar.zst nixlib-cfc5c35a0b39f3dc4ab73c2e4cd12191eb4ebe09.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/anbox/0002-NixOS-Build-android-emugl-with-cpp-14.patch | 11 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/anbox/default.nix | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/anbox/0002-NixOS-Build-android-emugl-with-cpp-14.patch b/pkgs/os-specific/linux/anbox/0002-NixOS-Build-android-emugl-with-cpp-14.patch new file mode 100644 index 000000000000..bf8750282684 --- /dev/null +++ b/pkgs/os-specific/linux/anbox/0002-NixOS-Build-android-emugl-with-cpp-14.patch @@ -0,0 +1,11 @@ +--- a/external/android-emugl/CMakeLists.txt ++++ b/external/android-emugl/CMakeLists.txt +@@ -1,7 +1,7 @@ + # Don't treat any warnings as error as we take the source directly from + # upstream and just compile it. + set(CMAKE_C_FLAGS "-Wall") +-set(CMAKE_CXX_FLAGS "-std=c++11 -Wall") ++set(CMAKE_CXX_FLAGS "-std=c++14 -Wall") + + # Ensure -fPIC + set(CMAKE_POSITION_INDEPENDENT_CODE ON) diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index ad03ba1aefb2..a3724c792482 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -130,6 +130,8 @@ stdenv.mkDerivation rec { }) # Ensures generated desktop files work on store path change ./0001-NixOS-Use-anbox-from-PATH-in-desktop-files.patch + # Allows android-emugl to build with gtest 1.13+ + ./0002-NixOS-Build-android-emugl-with-cpp-14.patch # Provide window icons (fetchpatch { url = "https://github.com/samueldr/anbox/commit/2387f4fcffc0e19e52e58fb6f8264fbe87aafe4d.patch"; |