diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-07-02 11:07:38 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-07-02 11:10:26 +0200 |
commit | c1ffc65d1a0fdcb69b447711f9896077df550dd7 (patch) | |
tree | 69d124e1fed0d3a8de59e1fdb27a072608a4f4e0 /pkgs/tools/networking | |
parent | f7781f52933ff4a83d1396f6255dfa91e727dc7c (diff) | |
parent | a22ba5f05b3fb1acd2ad870262a3583aee471c73 (diff) | |
download | nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.tar nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.tar.gz nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.tar.bz2 nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.tar.lz nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.tar.xz nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.tar.zst nixlib-c1ffc65d1a0fdcb69b447711f9896077df550dd7.zip |
Merge branch 'master' into staging
This apparently fixes some broken src fetches (gnuradio, twisted).
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/dnsperf/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 4a476a6ba137..2ebae0b0c17f 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { configureFlags = [ ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" ) ( if gnutlsSupport then "--with-gnutls=${gnutls.crossDrv}" else "--without-gnutls" ) - "--with-random /dev/urandom" + "--with-random=/dev/urandom" ]; }; diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index b978925c62b5..015046f2bdaa 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; buildInputs = [ bind zlib openssl ] - ++ stdenv.lib.optional stdenv.isLinux [ libcap libseccomp ]; + ++ stdenv.lib.optional stdenv.isLinux [ libcap libcap.lib libseccomp ]; postInstall = '' mkdir -p "$out/share/doc/" |