From a55efcb38991d19bdaa8f3674514eb1274de59e6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 25 Apr 2019 23:49:44 -0500 Subject: [PATCH] libsForQt5.qca-qt5: remove darwin patch, no longer needed --- .../development/libraries/qca-qt5/default.nix | 4 ---- .../libraries/qca-qt5/move-project.patch | 19 ------------------- 2 files changed, 23 deletions(-) delete mode 100644 pkgs/development/libraries/qca-qt5/move-project.patch diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 79b105a2d1c..9acea41da5c 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -12,10 +12,6 @@ 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 deleted file mode 100644 index 2a109a3aa3c..00000000000 --- a/pkgs/development/libraries/qca-qt5/move-project.patch +++ /dev/null @@ -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")