signon: build with Qt 5.5

+24 -4
+2 -2
pkgs/development/libraries/signon/default.nix
··· 1 - { stdenv, fetchzip, doxygen, qt5 }: 1 + { stdenv, fetchzip, doxygen, qtbase }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "signon-${version}"; ··· 8 8 sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a"; 9 9 }; 10 10 11 - buildInputs = [ qt5.base ]; 11 + buildInputs = [ qtbase ]; 12 12 nativeBuildInputs = [ doxygen ]; 13 13 14 14 configurePhase = ''
+18
pkgs/development/libraries/signon/old.nix
··· 1 + { stdenv, fetchzip, doxygen, qt5 }: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "signon-${version}"; 5 + version = "8.57"; 6 + src = fetchzip { 7 + url = "http://signond.accounts-sso.googlecode.com/archive/${version}.zip"; 8 + sha256 = "0q1ncmp27jrwbjkqisf0l63zzpw6bcsx5i4y86xixh8wd5arj87a"; 9 + }; 10 + 11 + buildInputs = [ qt5.base ]; 12 + nativeBuildInputs = [ doxygen ]; 13 + 14 + configurePhase = '' 15 + qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5 16 + ''; 17 + 18 + }
+4 -2
pkgs/top-level/all-packages.nix
··· 7956 7956 7957 7957 qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; 7958 7958 7959 + signon = callPackage ../development/libraries/signon { }; 7960 + 7959 7961 vlc = callPackage ../applications/video/vlc { 7960 7962 qt4 = null; 7961 7963 withQt5 = true; ··· 8117 8119 8118 8120 sfml = callPackage ../development/libraries/sfml { }; 8119 8121 8122 + signon = callPackage ../development/libraries/signon/old.nix {}; 8123 + 8120 8124 skalibs = callPackage ../development/libraries/skalibs { }; 8121 8125 8122 8126 slang = callPackage ../development/libraries/slang { }; ··· 8146 8150 sord-svn = callPackage ../development/libraries/sord/sord-svn.nix {}; 8147 8151 8148 8152 soundtouch = callPackage ../development/libraries/soundtouch {}; 8149 - 8150 - signon = callPackage ../development/libraries/signon { }; 8151 8153 8152 8154 spandsp = callPackage ../development/libraries/spandsp {}; 8153 8155