diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2021-03-09 18:24:01 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2021-03-09 18:24:01 +0900 |
| commit | 21e3a8abe78870df215c3c5d48124a979bde0a65 (patch) | |
| tree | 016f1ec0774f115dbbf99bfea384a196d7de9f5e /pkgs/stdenv | |
| parent | c5eea46e603e1247bf67a4dd6b61d883e7e69b8c (diff) | |
| download | nixpkgs-21e3a8abe78870df215c3c5d48124a979bde0a65.tar nixpkgs-21e3a8abe78870df215c3c5d48124a979bde0a65.tar.gz nixpkgs-21e3a8abe78870df215c3c5d48124a979bde0a65.tar.bz2 nixpkgs-21e3a8abe78870df215c3c5d48124a979bde0a65.tar.lz nixpkgs-21e3a8abe78870df215c3c5d48124a979bde0a65.tar.xz nixpkgs-21e3a8abe78870df215c3c5d48124a979bde0a65.tar.zst nixpkgs-21e3a8abe78870df215c3c5d48124a979bde0a65.zip | |
stdenv/darwin: allow brotli reference from curl
Brotli is recently a default dependency of curl in nixpkgs. See e3d19670a0f6b012aac5e05b50951d8a991ba143 in #112947
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 3e5c46709ac..a7b91a82a9d 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -322,7 +322,7 @@ in rec { libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils - libssh2 nghttp2 libkrb5 ninja; + libssh2 nghttp2 libkrb5 ninja brotli; llvmPackages_7 = super.llvmPackages_7 // (let tools = super.llvmPackages_7.tools.extend (_: _: { @@ -359,7 +359,7 @@ in rec { [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out libcxx libcxxabi llvmPackages_7.compiler-rt - llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out + llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out brotli.lib openssl.out libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv ]) ++ (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]); @@ -411,7 +411,7 @@ in rec { [ bootstrapTools ] ++ (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi llvmPackages_7.compiler-rt - llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out openssl.out + llvmPackages_7.clang-unwrapped zlib libxml2.out curl.out brotli.lib openssl.out libssh2.out nghttp2.lib libkrb5 coreutils gnugrep pcre.out gmp libiconv ]) ++ (with pkgs.darwin; [ dyld ICU Libsystem locale ]); @@ -533,7 +533,7 @@ in rec { gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.lib patch pcre.out gettext binutils.bintools darwin.binutils darwin.binutils.bintools - curl.out openssl.out libssh2.out nghttp2.lib libkrb5 + curl.out brotli.lib openssl.out libssh2.out nghttp2.lib libkrb5 cc.expand-response-params libxml2.out ]) ++ (with pkgs.darwin; [ dyld Libsystem CF cctools ICU libiconv locale libtapi |