pyrox.dev / nixpkgs
lol
fork atom

libsodium: split dev output, enableParallelBuilding

Vladimír Čunát 86cc3d32 90d5e878

+9 -5
unified split
+4
pkgs/development/libraries/libsodium/default.nix
··· 8 8 sha256 = "120jkda2q58p0n68banh64vsfm3hgqnacagj425d218cr4ycdkyb"; 9 9 }; 10 10 11 + outputs = [ "dev" "out" ]; 12 + 13 + enableParallelBuilding = true; 14 + 11 15 doCheck = true; 12 16 13 17 meta = with stdenv.lib; {
+2 -2
pkgs/development/libraries/libtoxcore/new-api/default.nix
··· 27 27 ''; 28 28 29 29 configureFlags = [ 30 - "--with-libsodium-headers=${libsodium}/include" 31 - "--with-libsodium-libs=${libsodium}/lib" 30 + "--with-libsodium-headers=${libsodium.dev}/include" 31 + "--with-libsodium-libs=${libsodium.out}/lib" 32 32 "--enable-ntox" 33 33 "--enable-daemon" 34 34 ];
+2 -2
pkgs/development/libraries/libtoxcore/old-api/default.nix
··· 31 31 ''; 32 32 33 33 configureFlags = [ 34 - "--with-libsodium-headers=${libsodium}/include" 35 - "--with-libsodium-libs=${libsodium}/lib" 34 + "--with-libsodium-headers=${libsodium.dev}/include" 35 + "--with-libsodium-libs=${libsodium.out}/lib" 36 36 "--enable-ntox" 37 37 "--enable-daemon" 38 38 ];
+1 -1
pkgs/tools/networking/netsniff-ng/default.nix
··· 22 22 configurePhase = '' 23 23 patchShebangs configure 24 24 substituteInPlace configure --replace "which" "command -v" 25 - NACL_INC_DIR=${libsodium}/include/sodium NACL_LIB=sodium ./configure 25 + NACL_INC_DIR=${libsodium.dev}/include/sodium NACL_LIB=sodium ./configure 26 26 ''; 27 27 28 28 enableParallelBuilding = true;