From 02be8958205a7de898f2b670208b0c64bf75c368 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 25 Jul 2008 13:33:42 +0000
Subject: [PATCH] * Inline the builder.

svn path=/nixos/trunk/; revision=12428
---
 helpers/setuid/builder.sh  | 7 -------
 helpers/setuid/default.nix | 8 +++++---
 2 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 helpers/setuid/builder.sh

diff --git a/helpers/setuid/builder.sh b/helpers/setuid/builder.sh
deleted file mode 100644
index 574a73ac11c8..000000000000
--- a/helpers/setuid/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out/bin
-
-gcc -Wall -O2 -DWRAPPER_DIR=\"$wrapperDir\" $setuidWrapper -o $out/bin/setuid-wrapper
-
-strip -s $out/bin/setuid-wrapper
diff --git a/helpers/setuid/default.nix b/helpers/setuid/default.nix
index 559ecca162f2..362bd937cc49 100644
--- a/helpers/setuid/default.nix
+++ b/helpers/setuid/default.nix
@@ -2,7 +2,9 @@
 
 stdenv.mkDerivation {
   name = "setuid-wrapper";
-  builder = ./builder.sh;
-  setuidWrapper = ./setuid-wrapper.c;
-  inherit wrapperDir;
+  buildCommand = ''
+    ensureDir $out/bin
+    gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" ${./setuid-wrapper.c} -o $out/bin/setuid-wrapper
+    strip -s $out/bin/setuid-wrapper
+  '';
 }