From 6a6ecde159848ac21f491226ab542b39cbd58744 Mon Sep 17 00:00:00 2001 From: Artjom Vejsel Date: Mon, 29 Jun 2015 20:42:31 +0300 Subject: [PATCH 1/3] filter-audio library: init at 20150624 --- .../libraries/filter-audio/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/filter-audio/default.nix diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix new file mode 100644 index 00000000000..989d9518a0e --- /dev/null +++ b/pkgs/development/libraries/filter-audio/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "filter-audio-20150624"; + + src = fetchgit { + url = "https://github.com/irungentoo/filter_audio.git"; + rev = "612c5a102550c614e4c8f859e753ea64c0b7250c"; + sha256 = "0bmf8dxnr4vb6y36lvlwqd5x68r4cbsd625kbw3pypm5yqp0n5na"; + }; + + doCheck = false; + + makeFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + description = "Lightweight audio filtering library made from webrtc code"; + license = licenses.bsd3; + maintainers = with maintainers; [ viric jgeerds ]; + platforms = platforms.all; + }; +} + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac6607daf92..0f457aa5cd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6116,6 +6116,8 @@ let fftwSinglePrec = fftw.override { precision = "single"; }; fftwFloat = fftwSinglePrec; # the configure option is just an alias + filter-audio = callPackage ../development/libraries/filter-audio {}; + fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; flann = callPackage ../development/libraries/flann { }; From 68f4a0f0eaf175eea2f17383105dae7b97d526f2 Mon Sep 17 00:00:00 2001 From: Artjom Vejsel Date: Wed, 1 Jul 2015 10:16:09 +0300 Subject: [PATCH 2/3] libtoxcore: added new-api version --- .../libraries/libtoxcore/new-api/default.nix | 60 +++++++++++++++++++ .../libtoxcore/{ => old-api}/default.nix | 0 pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libtoxcore/new-api/default.nix rename pkgs/development/libraries/libtoxcore/{ => old-api}/default.nix (100%) diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix new file mode 100644 index 00000000000..42f81cf6a9d --- /dev/null +++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus +, libvpx, check, libconfig, pkgconfig }: + +stdenv.mkDerivation rec { + name = "tox-core-dev-20150629"; + + src = fetchFromGitHub { + owner = "irungentoo"; + repo = "toxcore"; + rev = "219fabc0f5dbaac7968cb7728d25dface3ebb2ea"; + sha256 = "1rsnxa5b7i2zclx0kzbf4a5mds0jfkvfjz1s4whzk7rf8w3vpqkh"; + }; + + NIX_LDFLAGS = "-lgcc_s"; + + postPatch = '' + # within Nix chroot builds, localhost is unresolvable + sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \ + auto_tests/network_test.c + # takes WAAAY too long (~10 minutes) and would timeout + sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \ + auto_tests/tox_test.c + ''; + + preConfigure = '' + autoreconf -i + ''; + + configureFlags = [ + "--with-libsodium-headers=${libsodium}/include" + "--with-libsodium-libs=${libsodium}/lib" + "--enable-ntox" + "--enable-daemon" + ]; + + buildInputs = [ + autoconf libtool automake libsodium ncurses + check libconfig pkgconfig + ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + libopus + ]; + + propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ]; + + # Some tests fail randomly due to timeout. This kind of problem is well known + # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054} + # They don't recommend running tests on 50core machines with other cpu-bound + # tests running in parallel. + # + # NOTE: run the tests locally on your machine before upgrading this package! + doCheck = false; + + meta = with stdenv.lib; { + description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ viric jgeerds ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/old-api/default.nix similarity index 100% rename from pkgs/development/libraries/libtoxcore/default.nix rename to pkgs/development/libraries/libtoxcore/old-api/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f457aa5cd7..f83d01c055e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7268,7 +7268,9 @@ let else stdenv; }; - libtoxcore = callPackage ../development/libraries/libtoxcore { }; + libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { }; + + libtoxcore-dev = callPackage ../development/libraries/libtoxcore/new-api { }; libtsm = callPackage ../development/libraries/libtsm { automake = automake114x; From 25ee65de97617364413f3e69686b186d30e89107 Mon Sep 17 00:00:00 2001 From: Artjom Vejsel Date: Mon, 29 Jun 2015 20:43:40 +0300 Subject: [PATCH 3/3] qtox: 20150128 -> 20150624 --- .../instant-messengers/qtox/default.nix | 56 +++++++++---------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 874f68f0ec2..cba5bdeec7e 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,41 +1,38 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openal, opencv -, libsodium, libXScrnSaver }: +{ stdenv, fetchgit, pkgconfig, libtoxcore-dev, qt5, openal, opencv, + libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, + pango, atk, qrencode, ffmpeg, filter-audio }: -let +stdenv.mkDerivation rec { + name = "qtox-dev-20150624"; - filteraudio = stdenv.mkDerivation rec { - name = "filter_audio-20150128"; - - src = fetchFromGitHub { - owner = "irungentoo"; - repo = "filter_audio"; - rev = "76428a6cda"; - sha256 = "0c4wp9a7dzbj9ykfkbsxrkkyy0nz7vyr5map3z7q8bmv9pjylbk9"; - }; - - doCheck = false; - - makeFlags = "PREFIX=$(out)"; - }; - -in stdenv.mkDerivation rec { - name = "qtox-dev-20150130"; - - src = fetchFromGitHub { - owner = "tux3"; - repo = "qTox"; - rev = "7574569b3d"; - sha256 = "0a7zkhl4w2r5ifzs7vwws2lpplp6q5c4jllyf4ld64njgiz6jzip"; + src = fetchgit { + url = "https://github.com/tux3/qTox.git"; + rev = "9f386135a2cf428d2802b158c70be4beee5abf86"; + sha256 = "1m2y50q5yim1q75k48cy5daq5qm77cvb3kcla7lpqv54xnfdwxk8"; }; buildInputs = [ - libtoxcore openal opencv libsodium filteraudio - qt5.base qt5.tools libXScrnSaver + libtoxcore-dev openal opencv libsodium filter-audio + qt5.base qt5.tools libXScrnSaver glib gtk2 cairo + pango atk qrencode ffmpeg qt5.translations ]; + nativeBuildInputs = [ pkgconfig ]; - configurePhase = "qmake"; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags glib-2.0)" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gdk-pixbuf-2.0)" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags cairo)" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags pango)" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags atk)" + ''; + + configurePhase = '' + runHook preConfigure + qmake + ''; installPhase = '' mkdir -p $out/bin @@ -49,3 +46,4 @@ in stdenv.mkDerivation rec { platforms = platforms.all; }; } +