diff options
| author | Stéphan Kochen <git@stephank.nl> | 2021-05-17 20:00:50 +0200 |
|---|---|---|
| committer | Stéphan Kochen <git@stephank.nl> | 2021-05-17 20:01:20 +0200 |
| commit | b9efe88a98ddeaf3480d8a57ee78b68d553bb8a3 (patch) | |
| tree | 4b2820c9f77cbb136944d9d1afc53e659e676975 /pkgs/development/libraries/qca-qt5 | |
| parent | 11d75bc234a86c5d6ddeada4bad67616da56d046 (diff) | |
libsForQt5.qca-qt5: fix darwin build
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 | 17 |
2 files changed, 0 insertions, 21 deletions
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index e53404557fba2..f8159417378c0 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { 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 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 dcecb83d7db95..0000000000000 --- a/pkgs/development/libraries/qca-qt5/move-project.patch +++ /dev/null @@ -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") |