diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2007-11-03 08:19:00 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2007-11-03 08:19:00 +0000 |
| commit | f723c676b87f70ff292ed1ae21b5c2d86b5b4ccf (patch) | |
| tree | e7e8fea382fe2354ae7981bcc4a098a40c49c20e /pkgs/top-level/builder-defs.nix | |
| parent | 56cd763e464f95a9f55d093f8f1682f918e0aa74 (diff) | |
| download | nixlib-f723c676b87f70ff292ed1ae21b5c2d86b5b4ccf.tar nixlib-f723c676b87f70ff292ed1ae21b5c2d86b5b4ccf.tar.gz nixlib-f723c676b87f70ff292ed1ae21b5c2d86b5b4ccf.tar.bz2 nixlib-f723c676b87f70ff292ed1ae21b5c2d86b5b4ccf.tar.lz nixlib-f723c676b87f70ff292ed1ae21b5c2d86b5b4ccf.tar.xz nixlib-f723c676b87f70ff292ed1ae21b5c2d86b5b4ccf.tar.zst nixlib-f723c676b87f70ff292ed1ae21b5c2d86b5b4ccf.zip | |
Added ltrace - library call tracer. Note that it needed adding an extension point to doUnpack, but it doesn't force full rebuild of everything using builder composing.
svn path=/nixpkgs/trunk/; revision=9574
Diffstat (limited to 'pkgs/top-level/builder-defs.nix')
| -rw-r--r-- | pkgs/top-level/builder-defs.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix index c164aaae4fd9..dbedc27c39ab 100644 --- a/pkgs/top-level/builder-defs.nix +++ b/pkgs/top-level/builder-defs.nix @@ -117,7 +117,7 @@ rec } ") [minInit]; - toSrcDir = s : FullDepEntry (if (archiveType s) == "tar" then " + toSrcDir = s : FullDepEntry ((if (archiveType s) == "tar" then " tar xvf ${s} cd \"\$(tar tf ${s} | head -1 | sed -e 's@/.*@@' )\" " else if (archiveType s) == "tgz" then " @@ -126,7 +126,9 @@ rec " else if (archiveType s) == "tbz2" then " tar xvjf ${s} cd \"\$(tar tjf ${s} | head -1 | sed -e 's@/.*@@' )\" - " else (abort "unknown archive type : ${s}")) [minInit]; + " else (abort "unknown archive type : ${s}"))+ + (if args ? goSrcDir then args.goSrcDir else "") + ) [minInit]; doConfigure = FullDepEntry (" ./configure --prefix=\"\$prefix\" ${toString (getAttr ["configureFlags"] "" args)} |