Moving the attribute tox_core to libtoxcore. It seems more appropiate.
This commit is contained in:
parent
fb8494b18b
commit
8a3652544b
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses
|
||||
, tox_core, pkgconfig }:
|
||||
, libtoxcore, pkgconfig }:
|
||||
|
||||
let
|
||||
version = "75d356e52a";
|
||||
@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
|
||||
NIX_LDFLAGS = "-lsodium";
|
||||
|
||||
configureFlags = [
|
||||
"--with-libtoxcore-headers=${tox_core}/include"
|
||||
"--with-libtoxcore-libs=${tox_core}/lib"
|
||||
"--with-libsodium-headers=${tox_core}/include"
|
||||
"--with-libsodium-libs=${tox_core}/lib"
|
||||
"--with-libtoxcore-headers=${libtoxcore}/include"
|
||||
"--with-libtoxcore-libs=${libtoxcore}/lib"
|
||||
"--with-libsodium-headers=${libtoxcore}/include"
|
||||
"--with-libsodium-libs=${libtoxcore}/lib"
|
||||
];
|
||||
|
||||
buildInputs = [ autoconf libtool automake tox_core libsodium ncurses pkgconfig ];
|
||||
buildInputs = [ autoconf libtool automake libtoxcore libsodium ncurses pkgconfig ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
@ -4984,6 +4984,8 @@ let
|
||||
else stdenv;
|
||||
};
|
||||
|
||||
libtoxcore = callPackage ../development/libraries/libtoxcore { };
|
||||
|
||||
libtunepimp = callPackage ../development/libraries/libtunepimp { };
|
||||
|
||||
libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { };
|
||||
@ -8717,8 +8719,6 @@ let
|
||||
wrapPython = pythonPackages.wrapPython;
|
||||
};
|
||||
|
||||
tox_core = callPackage ../applications/networking/instant-messengers/toxcore { };
|
||||
|
||||
toxic = callPackage ../applications/networking/instant-messengers/toxic { };
|
||||
|
||||
transmission = callPackage ../applications/networking/p2p/transmission { };
|
||||
|
Loading…
x
Reference in New Issue
Block a user