nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 07:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30318 from peterhoeg/u/qtox

Browse Source 
libmsgpack/libtoxcore/qtox: several related package upgrades
This commit is contained in:
Franz Pletz 2017-11-09 07:09:34 +01:00 committed by GitHub
commit 72450025dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/networking/instant-messengers/qtox/default.nix
View File

@ -2,25 +2,25 @@
libtoxcore, libtoxcore,
libpthreadstubs, libXdmcp, libXScrnSaver, libpthreadstubs, libXdmcp, libXScrnSaver,
qtbase, qtsvg, qttools, qttranslations, qtbase, qtsvg, qttools, qttranslations,
ffmpeg, filter-audio, libsodium, libopus, ffmpeg, filter-audio, libexif, libsodium, libopus,
libvpx, openal, opencv, pcre, qrencode, sqlcipher }: libvpx, openal, opencv, pcre, qrencode, sqlcipher }:
mkDerivation rec { mkDerivation rec {
name = "qtox-${version}"; name = "qtox-${version}";
version = "1.11.0"; version = "1.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tux3"; owner = "qTox";
repo = "qTox"; repo = "qTox";
rev = "v${version}"; rev = "v${version}";
sha256 = "0h8v359h1xn2xm6xa9q56mjiw58ap1bpiwx1dxxmphjildxadwck"; sha256 = "1832ay0167qjc2vvpps507mnb0531y3d3pxmlm5nakvcwjs7vl8d";
}; };
buildInputs = [ buildInputs = [
libtoxcore libtoxcore
libpthreadstubs libXdmcp libXScrnSaver libpthreadstubs libXdmcp libXScrnSaver
qtbase qtsvg qttools qttranslations qtbase qtsvg qttools qttranslations
ffmpeg filter-audio libopus libsodium ffmpeg filter-audio libexif libopus libsodium
libvpx openal opencv pcre qrencode sqlcipher libvpx openal opencv pcre qrencode sqlcipher
]; ];
@ -37,6 +37,7 @@ mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Qt Tox client"; description = "Qt Tox client";
homepage = https://tox.chat;
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ]; maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ];
platforms = platforms.all; platforms = platforms.all;

4
pkgs/applications/networking/instant-messengers/utox/default.nix
View File

@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DENABLE_UPDATER=OFF" "-DENABLE_UPDATER=OFF"
]; ] ++ stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
doCheck = false; doCheck = true;
checkTarget = "test"; checkTarget = "test";

12
pkgs/development/libraries/libmsgpack/2.0.nix Normal file
View File

@ -0,0 +1,12 @@
{ callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2.0.0";
src = fetchFromGitHub {
owner = "msgpack";
repo = "msgpack-c";
rev = "cpp-${version}";
sha256 = "189m44pwpcpf7g4yhzfla4djqyp2kl54wxmwfaj94gwgj5s370i7";
};
})

10
pkgs/development/libraries/libmsgpack/default.nix
View File

@ -1,12 +1,12 @@
{ callPackage, fetchFromGitHub, ... } @ args: { callPackage, fetchFromGitHub, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "2.0.0"; version = "2.1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "msgpack"; owner = "msgpack";
repo = "msgpack-c"; repo = "msgpack-c";
rev = "cpp-${version}"; rev = "cpp-${version}";
sha256 = "189m44pwpcpf7g4yhzfla4djqyp2kl54wxmwfaj94gwgj5s370i7"; sha256 = "0n4kvma3dldfsvv7b0zw23qln6av5im2aqqd6m890i75zwwkw0zv";
}; };
}) })

13
pkgs/development/libraries/libmsgpack/generic.nix
View File

@ -11,16 +11,21 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
enableParallelBuilding = true;
crossAttrs = { crossAttrs = {
} // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") { } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
cmakeFlags = "-DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=Windows"; cmakeFlags = [
"-DMSGPACK_BUILD_EXAMPLES=OFF"
"-DCMAKE_SYSTEM_NAME=Windows"
];
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MessagePack implementation for C and C++"; description = "MessagePack implementation for C and C++";
homepage = http://msgpack.org; homepage = http://msgpack.org;
license = licenses.asl20;
maintainers = with maintainers; [ redbaron wkennington ]; maintainers = with maintainers; [ redbaron wkennington ];
license = licenses.asl20; platforms = platforms.all;
platforms = platforms.all;
}; };
} }

8
pkgs/development/libraries/libtoxcore/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libtoxcore-${version}"; name = "libtoxcore-${version}";
version = "0.1.8"; version = "0.1.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "TokTok"; owner = "TokTok";
repo = "c-toxcore"; repo = "c-toxcore";
rev = "v${version}"; rev = "v${version}";
sha256 = "08vdq3j60wn62lj2z9f3f47hibns93rvaqx5xc5bm3nglk70q7kk"; sha256 = "1d3f7lnlxra2lhih838bvlahxqv50j35g9kfyzspq971sb5z30mv";
}; };
cmakeFlags = [ cmakeFlags = [
@ -24,7 +24,11 @@ stdenv.mkDerivation rec {
libopus libopus
libvpx libvpx
]; ];
nativeBuildInputs = [ cmake pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig ];
enableParallelBuilding = true;
checkInputs = [ check ]; checkInputs = [ check ];
checkPhase = "ctest"; checkPhase = "ctest";

1
pkgs/top-level/all-packages.nix
View File

@ -9243,6 +9243,7 @@ with pkgs;
libmtp = callPackage ../development/libraries/libmtp { }; libmtp = callPackage ../development/libraries/libmtp { };
libmsgpack = callPackage ../development/libraries/libmsgpack { }; libmsgpack = callPackage ../development/libraries/libmsgpack { };
libmsgpack_2_0 = callPackage ../development/libraries/libmsgpack/2.0.nix { };
libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { }; libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { };
libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp {