Author: eelco
Date: Wed Sep 7 15:15:37 2011
New Revision: 29081
URL: https://svn.nixos.org/websvn/nix/?rev=29081&sc=1
Log:
* Hacky: don't do tracing on derivations that produce
a single regular file. Those fail because the tracer
creates $out/.build and $out/.trace.
Modified:
nixpkgs/branches/syscall-tracing/pkgs/build-support/fetchurl/default.nix
nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
Modified:
nixpkgs/branches/syscall-tracing/pkgs/build-support/fetchurl/default.nix
==============================================================================
--- nixpkgs/branches/syscall-tracing/pkgs/build-support/fetchurl/default.nix
Wed Sep 7 15:14:17 2011 (r29080)
+++ nixpkgs/branches/syscall-tracing/pkgs/build-support/fetchurl/default.nix
Wed Sep 7 15:15:37 2011 (r29081)
@@ -13,6 +13,7 @@
stdenv.mkDerivation ({
name = "mirrors-list";
builder = ./write-mirror-list.sh;
+ dontTrace = true;
} // mirrors);
# Names of the master sites that are mirrored (i.e., "sourceforge",
@@ -64,6 +65,8 @@
if showURLs then "urls"
else if name != "" then name
else baseNameOf (toString (builtins.head urls_));
+
+ dontTrace = true;
builder = ./builder.sh;
Modified: nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix
==============================================================================
--- nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Wed Sep 7
15:14:17 2011 (r29080)
+++ nixpkgs/branches/syscall-tracing/pkgs/stdenv/adapters.nix Wed Sep 7
15:15:37 2011 (r29081)
@@ -364,7 +364,7 @@
traceSyscalls = stdenv: stdenv //
{ mkDerivation = args: pkgs.lib.overrideDerivation (stdenv.mkDerivation
args)
- (args2: {
+ (args2: if args2 ? dontTrace then { } else {
realArgs = args2.args;
args = [ "-e" traceScript ];
enableParallelBuilding = false;
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
