ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

libsodium: split dev output, enableParallelBuilding

Browse Source
This commit is contained in:
Vladimír Čunát 2015-10-13 22:38:36 +02:00
parent 90d5e87862
commit 86cc3d32ac
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libsodium/default.nix
View File

@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "120jkda2q58p0n68banh64vsfm3hgqnacagj425d218cr4ycdkyb";
};
outputs = [ "dev" "out" ];
enableParallelBuilding = true;
doCheck = true;
meta = with stdenv.lib; {

4
pkgs/development/libraries/libtoxcore/new-api/default.nix
View File

@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
"--with-libsodium-headers=${libsodium}/include"
"--with-libsodium-libs=${libsodium}/lib"
"--with-libsodium-headers=${libsodium.dev}/include"
"--with-libsodium-libs=${libsodium.out}/lib"
"--enable-ntox"
"--enable-daemon"
];

4
pkgs/development/libraries/libtoxcore/old-api/default.nix
View File

@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
"--with-libsodium-headers=${libsodium}/include"
"--with-libsodium-libs=${libsodium}/lib"
"--with-libsodium-headers=${libsodium.dev}/include"
"--with-libsodium-libs=${libsodium.out}/lib"
"--enable-ntox"
"--enable-daemon"
];

2
pkgs/tools/networking/netsniff-ng/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation {
configurePhase = ''
patchShebangs configure
substituteInPlace configure --replace "which" "command -v"
NACL_INC_DIR=${libsodium}/include/sodium NACL_LIB=sodium ./configure
NACL_INC_DIR=${libsodium.dev}/include/sodium NACL_LIB=sodium ./configure
'';
enableParallelBuilding = true;