public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix qca-qt5 build on darwin

Browse Source
This commit is contained in:
Matthew Pickering 2018-03-13 20:13:31 +00:00
parent 5fe1be88a5
commit 2b114a8c29
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/qca-qt5/default.nix
View File

@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl qtbase ]; buildInputs = [ openssl qtbase ];
nativeBuildInputs = [ cmake pkgconfig ]; 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 # tells CMake to use this CA bundle file if it is accessible
preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt''; preConfigure = ''export QC_CERTSTORE_PATH=/etc/ssl/certs/ca-certificates.crt'';
@ -22,6 +26,6 @@ stdenv.mkDerivation rec {
homepage = http://delta.affinix.com/qca; homepage = http://delta.affinix.com/qca;
maintainers = with maintainers; [ ttuegel ]; maintainers = with maintainers; [ ttuegel ];
license = licenses.lgpl21Plus; license = licenses.lgpl21Plus;
platforms = with platforms; linux; platforms = with platforms; unix;
}; };
} }

19
pkgs/development/libraries/qca-qt5/move-project.patch Normal file
View File

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