diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-19 17:47:49 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-20 07:56:35 -0600 |
commit | fef302e3e4d918e54bea423c6b42ab91c137ca01 (patch) | |
tree | 709075faf9d7dd8e7f6b439d9b83b7d016fffbc8 | |
parent | 2a8b6959cccea20806793f88b9fc7c7c230c2dc0 (diff) | |
download | nixpkgs-fef302e3e4d918e54bea423c6b42ab91c137ca01.tar nixpkgs-fef302e3e4d918e54bea423c6b42ab91c137ca01.tar.gz nixpkgs-fef302e3e4d918e54bea423c6b42ab91c137ca01.tar.bz2 nixpkgs-fef302e3e4d918e54bea423c6b42ab91c137ca01.tar.lz nixpkgs-fef302e3e4d918e54bea423c6b42ab91c137ca01.tar.xz nixpkgs-fef302e3e4d918e54bea423c6b42ab91c137ca01.tar.zst nixpkgs-fef302e3e4d918e54bea423c6b42ab91c137ca01.zip |
accounts-qt: Qt infrastructure update
-rw-r--r-- | pkgs/development/libraries/accounts-qt/old.nix | 27 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 1 insertions, 29 deletions
diff --git a/pkgs/development/libraries/accounts-qt/old.nix b/pkgs/development/libraries/accounts-qt/old.nix deleted file mode 100644 index 26a04362090..00000000000 --- a/pkgs/development/libraries/accounts-qt/old.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qt5 }: - -let version = "1.13"; in -stdenv.mkDerivation { - name = "accounts-qt-${version}"; - - src = fetchFromGitLab { - sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl"; - rev = version; - repo = "libaccounts-qt"; - owner = "accounts-sso"; - }; - - meta = with stdenv.lib; { - description = "Qt library for accessing the online accounts database"; - homepage = "http://code.google.com/p/accounts-sso/"; - license = licenses.lgpl21; - maintainers = with maintainers; [ nckx ]; - }; - - buildInputs = [ glib libaccounts-glib qt5.base ]; - nativeBuildInputs = [ doxygen pkgconfig ]; - - configurePhase = '' - qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e55121ea39e..07cf2a1194d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6047,8 +6047,6 @@ let accountsservice = callPackage ../development/libraries/accountsservice { }; - accounts-qt = callPackage ../development/libraries/accounts-qt/old.nix {}; - acl = callPackage ../development/libraries/acl { }; activemq = callPackage ../development/libraries/apache-activemq { }; @@ -15798,6 +15796,7 @@ let ### Deprecated aliases - for backward compatibility aliases = with self; rec { + accounts-qt = qt5.accounts-qt; # added 2015-12-19 adobeReader = adobe-reader; arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 |