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

Merge #290697: lib3mf: Apply patch to support C++14

Browse source 
...into staging-next
This commit is contained in:
Vladimír Čunát 2024-02-23 12:30:42 +01:00
commit c5baa7be8a
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/lib3mf/default.nix
View file

@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-WMTTYYgpCIM86a6Jw8iah/YVXN9T5youzEieWL/d+Bc=";
};
patches = [ ./upgrade-to-cpp-14.patch ];
nativeBuildInputs = [ cmake ninja pkg-config ];
outputs = [ "out" "dev" ];

18
pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch Normal file
View file

@ -0,0 +1,18 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f719beb7..a20f84eb8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,12 +34,12 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
# using GCC
add_definitions(-DBUILD_DLL)
add_compile_options(-Wall)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2")
elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
# using GCC
add_definitions(-DBUILD_DLL)
add_compile_options(-Wall)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2")
set(CMAKE_MACOSX_RPATH ON)
endif()