diff options
| author | Artjom Vejsel <akawolf0@gmail.com> | 2015-06-29 20:43:40 +0300 |
|---|---|---|
| committer | Artjom Vejsel <akawolf0@gmail.com> | 2015-07-01 14:39:04 +0300 |
| commit | 25ee65de97617364413f3e69686b186d30e89107 (patch) | |
| tree | a4a15ec06345705200827989255d7fca7f1dc7c5 /pkgs/applications/networking/instant-messengers/qtox/default.nix | |
| parent | 68f4a0f0eaf175eea2f17383105dae7b97d526f2 (diff) | |
| download | nixpkgs-25ee65de97617364413f3e69686b186d30e89107.tar nixpkgs-25ee65de97617364413f3e69686b186d30e89107.tar.gz nixpkgs-25ee65de97617364413f3e69686b186d30e89107.tar.bz2 nixpkgs-25ee65de97617364413f3e69686b186d30e89107.tar.lz nixpkgs-25ee65de97617364413f3e69686b186d30e89107.tar.xz nixpkgs-25ee65de97617364413f3e69686b186d30e89107.tar.zst nixpkgs-25ee65de97617364413f3e69686b186d30e89107.zip | |
qtox: 20150128 -> 20150624
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/qtox/default.nix')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/qtox/default.nix | 56 |
1 files 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; }; } + |