diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-06 15:32:17 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:18:48 +0200 |
| commit | 99e4371526a9cc48f1f10e2e9f144e3e839ad709 (patch) | |
| tree | 1cc37b42aae06673023c0e7c4168dda47d12f182 /pkgs/stdenv/darwin/make-bootstrap-tools.nix | |
| parent | e71c9cfaa23ddaffc03667e2020cf2ee6bd71fb7 (diff) | |
| download | nixpkgs-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar nixpkgs-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.gz nixpkgs-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.bz2 nixpkgs-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.lz nixpkgs-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.xz nixpkgs-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.zst nixpkgs-99e4371526a9cc48f1f10e2e9f144e3e839ad709.zip | |
curl: split into multiple outputs
Also use pkgconfig to be safer and fix (some) referrers.
Diffstat (limited to 'pkgs/stdenv/darwin/make-bootstrap-tools.nix')
| -rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 39d4ed86235..d6b5bef8f47 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -56,9 +56,9 @@ rec { # This used to be in-nixpkgs, but now is in the bundle # because I can't be bothered to make it partially static - cp ${curl}/bin/curl $out/bin - cp -d ${curl}/lib/libcurl*.dylib $out/lib - cp -d ${libssh2}/lib/libssh*.dylib $out/lib + cp ${curl.bin}/bin/curl $out/bin + cp -d ${curl.out}/lib/libcurl*.dylib $out/lib + cp -d ${libssh2.out}/lib/libssh*.dylib $out/lib cp -d ${openssl.out}/lib/*.dylib $out/lib cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib |