diff options
| author | Will Dietz <w@wdtz.org> | 2019-04-27 16:52:54 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-04-27 16:56:50 -0500 |
| commit | 65d7b10250f0a4ba3be354fcfca8940a6f86f528 (patch) | |
| tree | 92192c3b783219baa34412c8cfa7771a8ea7fd60 /pkgs/development/libraries/qca-qt5 | |
| parent | a55efcb38991d19bdaa8f3674514eb1274de59e6 (diff) | |
Revert "libsForQt5.qca-qt5: remove darwin patch, no longer needed"
This reverts commit 1ff3763ffad43ba66f31dabed9f2e8140f3381c0.
Diffstat (limited to 'pkgs/development/libraries/qca-qt5')
| -rw-r--r-- | pkgs/development/libraries/qca-qt5/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/qca-qt5/move-project.patch | 19 |
2 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 9acea41da5cde..79b105a2d1c81 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; + # Without this patch cmake fails with a "No known features for CXX compiler" + # error on darwin + patches = stdenv.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''; diff --git a/pkgs/development/libraries/qca-qt5/move-project.patch b/pkgs/development/libraries/qca-qt5/move-project.patch new file mode 100644 index 0000000000000..2a109a3aa3c73 --- /dev/null +++ b/pkgs/development/libraries/qca-qt5/move-project.patch @@ -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") |