diff options
| author | Will Dietz <w@wdtz.org> | 2019-04-27 19:36:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-27 19:36:04 -0500 |
| commit | 6eaf73868bb54fd6aa9b51989be26242fc2c2a08 (patch) | |
| tree | 1fb44ce38fab326165716a4cc517a238d6df63ed /pkgs/development/libraries | |
| parent | 072287bc091e24c762a3a61aee436287e319b7b2 (diff) | |
| parent | fde69b6821ea7e5bbd2d1af5bc98faf8843275cc (diff) | |
| download | nixlib-6eaf73868bb54fd6aa9b51989be26242fc2c2a08.tar nixlib-6eaf73868bb54fd6aa9b51989be26242fc2c2a08.tar.gz nixlib-6eaf73868bb54fd6aa9b51989be26242fc2c2a08.tar.bz2 nixlib-6eaf73868bb54fd6aa9b51989be26242fc2c2a08.tar.lz nixlib-6eaf73868bb54fd6aa9b51989be26242fc2c2a08.tar.xz nixlib-6eaf73868bb54fd6aa9b51989be26242fc2c2a08.tar.zst nixlib-6eaf73868bb54fd6aa9b51989be26242fc2c2a08.zip | |
Merge pull request #60043 from dtzWill/update/qca-qt5-2.2.0
libsForQt5.qca-qt5: 2.1.3 -> 2.2.1
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/qca-qt5/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/qca-qt5/move-project.patch | 20 |
2 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 6e190a656f63..79b105a2d1c8 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, cmake, openssl, pkgconfig, qtbase }: stdenv.mkDerivation rec { - name = "qca-qt5-2.1.3"; + pname = "qca-qt5"; + version = "2.2.1"; src = fetchurl { - url = "http://download.kde.org/stable/qca/2.1.3/src/qca-2.1.3.tar.xz"; - sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0"; + url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; + sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np"; }; buildInputs = [ openssl qtbase ]; diff --git a/pkgs/development/libraries/qca-qt5/move-project.patch b/pkgs/development/libraries/qca-qt5/move-project.patch index 2a109a3aa3c7..dcecb83d7db9 100644 --- a/pkgs/development/libraries/qca-qt5/move-project.patch +++ b/pkgs/development/libraries/qca-qt5/move-project.patch @@ -1,19 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 453fd8a..5f6ee11 100644 +index 2f2b5d0..971dee3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -6,13 +6,13 @@ if(NOT CMAKE_INSTALL_PREFIX) +@@ -6,10 +6,11 @@ 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() + + cmake_minimum_required(VERSION 3.4) + +project(qca) - ++ set(QCA_LIB_MAJOR_VERSION "2") - set(QCA_LIB_MINOR_VERSION "1") + set(QCA_LIB_MINOR_VERSION "2") + set(QCA_LIB_PATCH_VERSION "1") |