summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-08-25 13:20:07 +0100
committerGitHub <noreply@github.com>2017-08-25 13:20:07 +0100
commitd42deacc00940a829d207a687c45ab3578bb22b8 (patch)
treede6bc4954b7d2a6a008d83b802ed1e0b678cecef /pkgs
parent6ec7c5cff2ea7ece68f6fc2938b0f20fa57d8c91 (diff)
parent5bd10ff39b4e6d5742b643e08892d06cfb44f375 (diff)
downloadnixlib-d42deacc00940a829d207a687c45ab3578bb22b8.tar
nixlib-d42deacc00940a829d207a687c45ab3578bb22b8.tar.gz
nixlib-d42deacc00940a829d207a687c45ab3578bb22b8.tar.bz2
nixlib-d42deacc00940a829d207a687c45ab3578bb22b8.tar.lz
nixlib-d42deacc00940a829d207a687c45ab3578bb22b8.tar.xz
nixlib-d42deacc00940a829d207a687c45ab3578bb22b8.tar.zst
nixlib-d42deacc00940a829d207a687c45ab3578bb22b8.zip
Merge pull request #28487 from ilpianista/qoauth
qoauth: 1.0.1 -> 2.0.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/qoauth/default.nix20
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix
index 48a63e412343..fa998b9e1984 100644
--- a/pkgs/development/libraries/qoauth/default.nix
+++ b/pkgs/development/libraries/qoauth/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchurl, qt4, qca2, qmake4Hook }:
+{ stdenv, fetchurl, qt5, qca2-qt5 }:
 
 stdenv.mkDerivation {
-  name = "qoauth-1.0.1";
+  name = "qoauth-2.0.0";
 
   src = fetchurl {
-    url = https://github.com/ayoy/qoauth/tarball/v1.0.1;
-    name = "qoauth-1.0.1.tar.gz";
-    sha256 = "1ax0g4dd49a3a1699ams13bkhz690xfwqg8rxp1capbdpf2aa8cp";
+    url = https://github.com/ayoy/qoauth/archive/v2.0.0.tar.gz;
+    name = "qoauth-2.0.0.tar.gz";
+    sha256 = "a28005986410d333e03d077679cdf6c504ec5a33342867dc0f9fb0b74285e333";
   };
 
   patchPhase = "sed -e 's/lib64/lib/g' -i src/src.pro";
 
-  buildInputs = [ qt4 qca2 ];
-  nativeBuildInputs = [ qmake4Hook ];
+  buildInputs = [ qt5.qtbase qca2-qt5 ];
+  nativeBuildInputs = [ qt5.qmake ];
 
-  NIX_CFLAGS_COMPILE = [ "-I${qca2}/include/QtCrypto" ];
-  NIX_LDFLAGS = [ "-lqca" ];
+  NIX_CFLAGS_COMPILE = [ "-I${qca2-qt5}/include/Qca-qt5/QtCrypto" ];
+  NIX_LDFLAGS = [ "-lqca-qt5" ];
 
   meta = {
     description = "Qt library for OAuth authentication";
-    inherit (qt4.meta) platforms;
+    inherit (qt5.qtbase.meta) platforms;
     maintainers = [ ];
   };
 }