From 38461f18c3eea43fc876c58ed4e4ea9fdced97ec Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 27 Sep 2015 10:20:26 -0500 Subject: [PATCH] signon: build with Qt 5.5 --- pkgs/development/libraries/signon/default.nix | 4 ++-- pkgs/development/libraries/signon/old.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++-- 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/signon/old.nix diff --git a/pkgs/development/libraries/signon/default.nix b/pkgs/development/libraries/signon/default.nix index 7b3defb8a589..d33edf9726f9 100644 --- a/pkgs/development/libraries/signon/default.nix +++ b/pkgs/development/libraries/signon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, doxygen, qt5 }: +{ stdenv, fetchzip, doxygen, qtbase }: stdenv.mkDerivation rec { name = "signon-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a"; }; - buildInputs = [ qt5.base ]; + buildInputs = [ qtbase ]; nativeBuildInputs = [ doxygen ]; configurePhase = '' diff --git a/pkgs/development/libraries/signon/old.nix b/pkgs/development/libraries/signon/old.nix new file mode 100644 index 000000000000..7b3defb8a589 --- /dev/null +++ b/pkgs/development/libraries/signon/old.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchzip, doxygen, qt5 }: + +stdenv.mkDerivation rec { + name = "signon-${version}"; + version = "8.57"; + src = fetchzip { + url = "http://signond.accounts-sso.googlecode.com/archive/${version}.zip"; + sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a"; + }; + + buildInputs = [ qt5.base ]; + nativeBuildInputs = [ doxygen ]; + + configurePhase = '' + qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5 + ''; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b469a51f36dc..bfcfb409cf46 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7956,6 +7956,8 @@ let qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + signon = callPackage ../development/libraries/signon { }; + vlc = callPackage ../applications/video/vlc { qt4 = null; withQt5 = true; @@ -8117,6 +8119,8 @@ let sfml = callPackage ../development/libraries/sfml { }; + signon = callPackage ../development/libraries/signon/old.nix {}; + skalibs = callPackage ../development/libraries/skalibs { }; slang = callPackage ../development/libraries/slang { }; @@ -8147,8 +8151,6 @@ let soundtouch = callPackage ../development/libraries/soundtouch {}; - signon = callPackage ../development/libraries/signon { }; - spandsp = callPackage ../development/libraries/spandsp {}; spatialite_tools = callPackage ../development/libraries/spatialite-tools { };