public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving the attribute tox_core to libtoxcore. It seems more appropiate.

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2013-10-11 21:44:15 +02:00
parent fb8494b18b
commit 8a3652544b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/instant-messengers/toxic/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses { stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses
, tox_core, pkgconfig }: , libtoxcore, pkgconfig }:
let let
version = "75d356e52a"; version = "75d356e52a";
@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "-lsodium"; NIX_LDFLAGS = "-lsodium";
configureFlags = [ configureFlags = [
"--with-libtoxcore-headers=${tox_core}/include" "--with-libtoxcore-headers=${libtoxcore}/include"
"--with-libtoxcore-libs=${tox_core}/lib" "--with-libtoxcore-libs=${libtoxcore}/lib"
"--with-libsodium-headers=${tox_core}/include" "--with-libsodium-headers=${libtoxcore}/include"
"--with-libsodium-libs=${tox_core}/lib" "--with-libsodium-libs=${libtoxcore}/lib"
]; ];
buildInputs = [ autoconf libtool automake tox_core libsodium ncurses pkgconfig ]; buildInputs = [ autoconf libtool automake libtoxcore libsodium ncurses pkgconfig ];
doCheck = true; doCheck = true;

0
pkgs/applications/networking/instant-messengers/toxcore/default.nix → pkgs/development/libraries/libtoxcore/default.nix
View File

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

@ -4984,6 +4984,8 @@ let
else stdenv; else stdenv;
}; };
libtoxcore = callPackage ../development/libraries/libtoxcore { };
libtunepimp = callPackage ../development/libraries/libtunepimp { }; libtunepimp = callPackage ../development/libraries/libtunepimp { };
libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { }; libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { };
@ -8717,8 +8719,6 @@ let
wrapPython = pythonPackages.wrapPython; wrapPython = pythonPackages.wrapPython;
}; };
tox_core = callPackage ../applications/networking/instant-messengers/toxcore { };
toxic = callPackage ../applications/networking/instant-messengers/toxic { }; toxic = callPackage ../applications/networking/instant-messengers/toxic { };
transmission = callPackage ../applications/networking/p2p/transmission { }; transmission = callPackage ../applications/networking/p2p/transmission { };