diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-15 21:28:59 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-15 21:28:59 +0000 |
commit | f59f5d7d961b99d0a8abe28e89c29ddad6fb6164 (patch) | |
tree | b22beca6c07dc3123d0514e75096b867b23b4ce5 | |
parent | b83fc581e2f2c4d653eff4ccd824a57f80a43558 (diff) | |
download | nixlib-f59f5d7d961b99d0a8abe28e89c29ddad6fb6164.tar nixlib-f59f5d7d961b99d0a8abe28e89c29ddad6fb6164.tar.gz nixlib-f59f5d7d961b99d0a8abe28e89c29ddad6fb6164.tar.bz2 nixlib-f59f5d7d961b99d0a8abe28e89c29ddad6fb6164.tar.lz nixlib-f59f5d7d961b99d0a8abe28e89c29ddad6fb6164.tar.xz nixlib-f59f5d7d961b99d0a8abe28e89c29ddad6fb6164.tar.zst nixlib-f59f5d7d961b99d0a8abe28e89c29ddad6fb6164.zip |
* Handle weird cases when the server redirects us while setting a
cookie. svn path=/nixpkgs/trunk/; revision=7352
-rw-r--r-- | maintainers/docs/todo.txt | 6 | ||||
-rw-r--r-- | pkgs/build-support/fetchurl/builder.sh | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/maintainers/docs/todo.txt b/maintainers/docs/todo.txt index 138d1962686e..79432c85d142 100644 --- a/maintainers/docs/todo.txt +++ b/maintainers/docs/todo.txt @@ -13,4 +13,8 @@ seem to like Glibc `libintl.h'; needs the gettext one instead. [Move from libbonoboui] -* Fix the bzip2 build generically. \ No newline at end of file +* Fix the bzip2 build generically. + +* In stdenv/setup.sh: put the call to patchelf etc. in a separate + phase (fixupPhase?) that comes after the installPhase. This is so + that when one overrides installPhase, the fixup stuff is still done. diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 00b3ecb73e80..19514ac86675 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -2,7 +2,8 @@ source $stdenv/setup header "downloading $out from $url" -curl --fail --location --max-redirs 20 --disable-epsv "$url" > "$out" +curl --fail --location --max-redirs 20 --disable-epsv \ + --cookie-jar cookies "$url" > "$out" if test "$NIX_OUTPUT_CHECKED" != "1"; then if test "$outputHashAlgo" != "md5"; then |