* Don't strip debug info on Darwin, otherwise links by libtool fail

  ("/usr/bin/ld: can't use -s with -r (resulting file would not be
  relocatable)").
* Since stdenv/generic had to be modified for this, I forked it in
  situ.  This should be merged later.

svn path=/nixpkgs/trunk/; revision=1121

1 files changed, 33 insertions, 0 deletions

diff --git a/pkgs/stdenv/generic-branch/default.nix b/pkgs/stdenv/generic-branch/default.nix
new file mode 100644
index 00000000000..3aa2d3bfac0
--- /dev/null
+++ b/pkgs/stdenv/generic-branch/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, name, preHook ? null, postHook ? null, initialPath, gcc, shell
+, param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? ""
+}:
+
+let {
+
+  body =
+
+    stdenv.mkDerivation {
+      inherit name;
+
+      builder = ./builder.sh;
+
+      setup = ./setup.sh;
+
+      inherit preHook postHook initialPath gcc shell;
+
+      # TODO: make this more elegant.
+      inherit param1 param2 param3 param4 param5;
+    }
+
+    # Add a utility function to produce derivations that use this
+    # stdenv and its shell.
+    // {
+      mkDerivation = attrs: derivation (attrs // {
+        builder = shell;
+        args = ["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)];
+        stdenv = body;
+        system = body.system;
+      });
+    };
+
+}