diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2018-03-13 20:13:31 +0000 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2018-03-13 20:14:23 +0000 |
| commit | 2b114a8c29071b8adc44d5d5c63abbf503bc4cc8 (patch) | |
| tree | 42fc3c4106a488817a4cf9f4d4fa69c86f91dcba /pkgs/development/libraries/qca-qt5 | |
| parent | 5fe1be88a53e7213e946600c08b2a9ba793ff921 (diff) | |
| download | nixpkgs-2b114a8c29071b8adc44d5d5c63abbf503bc4cc8.tar nixpkgs-2b114a8c29071b8adc44d5d5c63abbf503bc4cc8.tar.gz nixpkgs-2b114a8c29071b8adc44d5d5c63abbf503bc4cc8.tar.bz2 nixpkgs-2b114a8c29071b8adc44d5d5c63abbf503bc4cc8.tar.lz nixpkgs-2b114a8c29071b8adc44d5d5c63abbf503bc4cc8.tar.xz nixpkgs-2b114a8c29071b8adc44d5d5c63abbf503bc4cc8.tar.zst nixpkgs-2b114a8c29071b8adc44d5d5c63abbf503bc4cc8.zip | |
Fix qca-qt5 build on darwin
Diffstat (limited to 'pkgs/development/libraries/qca-qt5')
| -rw-r--r-- | pkgs/development/libraries/qca-qt5/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/qca-qt5/move-project.patch | 19 |
2 files changed, 24 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index ee27d89f563..db40a40d02d 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ openssl qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; + # Without this patch cmake fails with a "No known features for CXX compiler" + # error + patches = [./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''; @@ -22,6 +26,6 @@ stdenv.mkDerivation rec { homepage = http://delta.affinix.com/qca; maintainers = with maintainers; [ ttuegel ]; license = licenses.lgpl21Plus; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } 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 00000000000..2a109a3aa3c --- /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") |