Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f2d24b8ec622
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ec191e7d960c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 14, 2018

  1. Fix qca-qt5 build on darwin 

    (cherry picked from commit 2b114a8)
    @mpickering @LnL7
    mpickering authored and LnL7 committed Mar 14, 2018
    Copy the full SHA
    4ab4af1 View commit details

  2. Only apply patch on darwin 

    (cherry picked from commit 4e96d0e)
    @mpickering @LnL7
    mpickering authored and LnL7 committed Mar 14, 2018
    Copy the full SHA
    ec191e7 View commit details
Showing with 24 additions and 1 deletion.
  1. +5 −1 pkgs/development/libraries/qca-qt5/default.nix
  2. +19 −0 pkgs/development/libraries/qca-qt5/move-project.patch
6 changes: 5 additions & 1 deletion pkgs/development/libraries/qca-qt5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 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'';

@@ -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;
};
}
19 changes: 19 additions & 0 deletions pkgs/development/libraries/qca-qt5/move-project.patch
View file
Original file line number Diff line number Diff line change
@@ -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")