Skip to content

Commit

Permalink
Fix qca-qt5 build on darwin
Browse files Browse the repository at this point in the history
  • Loading branch information
mpickering committed Mar 13, 2018
1 parent 5fe1be8 commit 2b114a8
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
6 changes: 5 additions & 1 deletion pkgs/development/libraries/qca-qt5/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl qtbase ];
nativeBuildInputs = [ cmake pkgconfig ];

# Without this patch cmake fails with a "No known features for CXX compiler"
# error
patches = [./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'';

Expand All @@ -22,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = http://delta.affinix.com/qca;
maintainers = with maintainers; [ ttuegel ];
license = licenses.lgpl21Plus;
platforms = with platforms; linux;
platforms = with platforms; unix;
};
}
19 changes: 19 additions & 0 deletions pkgs/development/libraries/qca-qt5/move-project.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 453fd8a..5f6ee11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,13 +6,13 @@ if(NOT CMAKE_INSTALL_PREFIX)
unset(CMAKE_INSTALL_PREFIX CACHE)
endif(NOT CMAKE_INSTALL_PREFIX)

-project(qca)

if(NOT APPLE)
cmake_minimum_required(VERSION 2.8.12)
else()
cmake_minimum_required(VERSION 3.0)
endif()
+project(qca)

set(QCA_LIB_MAJOR_VERSION "2")
set(QCA_LIB_MINOR_VERSION "1")

0 comments on commit 2b114a8

Please sign in to comment.