Merge pull request #123391 from stephank/fix-qca-qt5-darwin
libsForQt5.qca-qt5: fix darwin build
This commit is contained in:
commit
1d676b24a0
@ -14,10 +14,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
# Without this patch cmake fails with a "No known features for CXX compiler"
|
||||
# error on darwin
|
||||
patches = lib.optional stdenv.isDarwin ./move-project.patch ;
|
||||
|
||||
# tells CMake to use this CA bundle file if it is accessible
|
||||
preConfigure = "export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt";
|
||||
|
||||
|
@ -1,17 +0,0 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2f2b5d0..971dee3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -6,10 +6,11 @@ if(NOT CMAKE_INSTALL_PREFIX)
|
||||
unset(CMAKE_INSTALL_PREFIX CACHE)
|
||||
endif(NOT CMAKE_INSTALL_PREFIX)
|
||||
|
||||
-project(qca)
|
||||
|
||||
cmake_minimum_required(VERSION 3.4)
|
||||
|
||||
+project(qca)
|
||||
+
|
||||
set(QCA_LIB_MAJOR_VERSION "2")
|
||||
set(QCA_LIB_MINOR_VERSION "2")
|
||||
set(QCA_LIB_PATCH_VERSION "1")
|
Loading…
Reference in New Issue
Block a user