BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #290880 from simonhollingshead/anbox-cpp14

Browse source 
anbox: Make android-emugl compile with C++14.
This commit is contained in:
Luke Granger-Brown 2024-02-23 17:33:28 +00:00 committed by GitHub
commit 1ae9cee0f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/os-specific/linux/anbox/0002-NixOS-Build-android-emugl-with-cpp-14.patch Normal file
View file

@ -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)

2
pkgs/os-specific/linux/anbox/default.nix
View file

@ -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";