File tree 1 file changed +6
-3
lines changed 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change 465
465
466
466
# Takes a curl derivation and overrides it to have both .a and .so files,
467
467
# and have the `curl` executable be statically linked.
468
- statify_curl_including_exe = curl_drv :
468
+ statify_curl_including_exe = curl_drv : zlib_both :
469
469
( curl_drv . override ( old : {
470
470
# Disable gss support, because that requires `krb5`, which
471
471
# (as mentioned in note [krb5 can only be static XOR shared]) is a
474
474
# dynamically-linked `curl` binary from the overlay
475
475
# `archiveFilesOverlay` below where `statify_curl_including_exe` is used.
476
476
gssSupport = false ;
477
- zlib = statify_zlib old . zlib ;
477
+ zlib = zlib_both ;
478
478
} ) ) . overrideAttrs ( old : {
479
479
dontDisableStatic = true ;
480
480
660
660
} ;
661
661
662
662
# See comments on `statify_curl_including_exe` for the interaction with krb5!
663
- curl = statify_curl_including_exe previous . curl ;
663
+ # As mentioned in [Packages that can't be overridden by overlays], we can't
664
+ # override zlib to have static libs, so we have to pass in `zlib_both` explicitly
665
+ # so that `curl` can use it.
666
+ curl = statify_curl_including_exe previous . curl final . zlib_both ;
664
667
665
668
} ;
666
669
You can’t perform that action at this time.
0 commit comments