curl: propagate inputs instead of patching pkgconfig

Shea Levy 206d63ed f168973b

+1 -22
+1 -22
pkgs/tools/networking/curl/default.nix
··· 47 47 48 48 # Use pkgconfig only when necessary 49 49 nativeBuildInputs = optional (!isLight) pkgconfig; 50 - buildInputs = [ 50 + propagatedBuildInputs = [ 51 51 optZlib optOpenssl optLibssh2 optLibnghttp2 optC-ares 52 52 optGss optRtmpdump optOpenldap optLibidn 53 53 ]; ··· 101 101 (mkEnable true "cookies" null) 102 102 (mkEnable (optC-ares != null) "ares" null) 103 103 ]; 104 - 105 - # Fix all broken refernces to dependencies in .la and .pc files 106 - postInstall = optionalString (optZlib != null) '' 107 - sed -i 's,\(-lz\),-L${optZlib}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} 108 - '' + optionalString (optOpenssl != null) '' 109 - sed -i 's,\(-lssl\|-lcrypto\),-L${optOpenssl}/lib \1,' $out/lib/pkgconfig/libcurl.pc 110 - '' + optionalString (optLibssh2 != null) '' 111 - sed -i 's,\(-lssh2\),-L${optLibssh2}/lib \1,' $out/lib/pkgconfig/libcurl.pc 112 - '' + optionalString (optLibnghttp2 != null) '' 113 - sed -i 's,\(-lnghttp2\),-L${optLibnghttp2}/lib \1,' $out/lib/pkgconfig/libcurl.pc 114 - '' + optionalString (optC-ares != null) '' 115 - sed -i 's,\(-lcares\),-L${optC-ares}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} 116 - '' + optionalString (optGss != null) '' 117 - sed -i 's,\(-lgss\),-L${optGss}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} 118 - '' + optionalString (optRtmpdump != null) '' 119 - sed -i 's,\(-lrtmp\),-L${optRtmpdump}/lib \1,' $out/lib/pkgconfig/libcurl.pc 120 - '' + optionalString (optOpenldap != null) '' 121 - sed -i 's,\(-lgss\),-L${optOpenldap}/lib \1,' $out/lib/{libcurl.la,pkgconfig/libcurl.pc} 122 - '' + optionalString (optLibidn != null) '' 123 - sed -i 's,\(-lidn\),-L${optLibidn}/lib \1,' $out/lib/pkgconfig/libcurl.pc 124 - ''; 125 104 126 105 meta = { 127 106 description = "A command line tool for transferring files with URL syntax";