diff options
| author | Peter Hoeg <peter@hoeg.com> | 2019-04-10 15:06:47 +0800 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2019-04-18 15:37:31 +0800 |
| commit | 734eba699cc0b2fb34240ee1ff8b50b3fbedadaa (patch) | |
| tree | ae9521f64395b20ec22a2cc78a0d4c89d0d6b7b5 | |
| parent | acbdaa569f4ee387386ebe1b9e60b9f95b4ab21b (diff) | |
| download | nixpkgs-734eba699cc0b2fb34240ee1ff8b50b3fbedadaa.tar nixpkgs-734eba699cc0b2fb34240ee1ff8b50b3fbedadaa.tar.gz nixpkgs-734eba699cc0b2fb34240ee1ff8b50b3fbedadaa.tar.bz2 nixpkgs-734eba699cc0b2fb34240ee1ff8b50b3fbedadaa.tar.lz nixpkgs-734eba699cc0b2fb34240ee1ff8b50b3fbedadaa.tar.xz nixpkgs-734eba699cc0b2fb34240ee1ff8b50b3fbedadaa.tar.zst nixpkgs-734eba699cc0b2fb34240ee1ff8b50b3fbedadaa.zip | |
libqmatrixclient: init at 0.5.1.2
| -rw-r--r-- | pkgs/development/libraries/libqmatrixclient/default.nix | 42 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 28 insertions, 19 deletions
diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index 160ce9fcabf..a81e4ff0780 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -1,26 +1,32 @@ { stdenv, fetchFromGitHub, cmake -, qtbase }: +, qtbase, qtmultimedia }: -stdenv.mkDerivation rec { - name = "libqmatrixclient-${version}"; - version = "0.4.2.1"; +let + generic = version: sha256: prefix: stdenv.mkDerivation rec { + name = "libqmatrixclient-${version}"; - src = fetchFromGitHub { - owner = "QMatrixClient"; - repo = "libqmatrixclient"; - rev = "v${version}"; - sha256 = "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid"; - }; + src = fetchFromGitHub { + owner = "QMatrixClient"; + repo = "libqmatrixclient"; + rev = "${prefix}${version}"; + inherit sha256; + }; - buildInputs = [ qtbase ]; + buildInputs = [ qtbase qtmultimedia ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib; { - description= "A Qt5 library to write cross-platfrom clients for Matrix"; - homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; - license = licenses.lgpl21; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ peterhoeg ]; + meta = with stdenv.lib; { + description= "A Qt5 library to write cross-platfrom clients for Matrix"; + homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; + license = licenses.lgpl21; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ peterhoeg ]; + }; }; + +in rec { + libqmatrixclient_0_4 = generic "0.4.2.1" "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid" "v"; + libqmatrixclient_0_5 = generic "0.5.1.2" "0vvpm1vlqfvhgfvavifrj4998g8v33hp5xjf0n8zfsmg4lxlnfg1" ""; + libqmatrixclient = libqmatrixclient_0_4; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aba790b9273..d744f9866f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -987,7 +987,10 @@ in charles4 ; - libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { }; + inherit (libsForQt5.callPackage ../development/libraries/libqmatrixclient { }) + libqmatrixclient_0_4 + libqmatrixclient_0_5 + libqmatrixclient; quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; |