diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index a87bcc651d6..c2af1274a24 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -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; diff --git a/pkgs/applications/networking/instant-messengers/toxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/toxcore/default.nix rename to pkgs/development/libraries/libtoxcore/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b80e83b1dc1..f5e66473907 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };