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

Merge pull request #123391 from stephank/fix-qca-qt5-darwin

Browse Source 
libsForQt5.qca-qt5: fix darwin build
This commit is contained in:
Robert Scott 2021-05-17 21:47:29 +01:00 committed by GitHub
commit 1d676b24a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,10 +14,6 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true; 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 # 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";

17
pkgs/development/libraries/qca-qt5/move-project.patch
View File

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