1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00

Revert "libsForQt5.qca-qt5: remove darwin patch, no longer needed"

This reverts commit 1ff3763ffad43ba66f31dabed9f2e8140f3381c0.
This commit is contained in:
Will Dietz 2019-04-27 16:52:54 -05:00
parent a55efcb389
commit 65d7b10250
2 changed files with 23 additions and 0 deletions

View file

@ -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'';

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