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

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

Browse Source
This commit is contained in:
Will Dietz 2019-04-25 23:49:44 -05:00
parent 507d47bc30
commit a55efcb389
2 changed files with 0 additions and 23 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

@ -12,10 +12,6 @@ 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 on darwin
patches = stdenv.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'';

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

@ -1,19 +0,0 @@
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")