signon: build with Qt 5.5

This commit is contained in:
Thomas Tuegel 2015-09-27 10:20:26 -05:00
parent 078d544005
commit 38461f18c3
3 changed files with 24 additions and 4 deletions

View File

@ -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 = ''

View File

@ -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
'';
}

View File

@ -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 { };