* Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing

in its interaction with the ‘dontStrip’ attribute.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30848

pkgs/build-support/clang-wrapper/clang-wrapper.sh

@@ -103,11 +103,6 @@ if test "$dontLink" != "1"; then
 	fi
     done
     export NIX_LDFLAGS_SET=1
-
-    if test "$NIX_STRIP_DEBUG" = "1"; then
-        # Add executable-stripping flags.
-        extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP)
-    fi
 fi
 
 # As a very special hack, if the arguments are just `-v', then don't

pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh

@@ -89,11 +89,6 @@ if test "$dontLink" != "1"; then
         fi
     done
     export NIX_CROSS_LDFLAGS_SET=1
-
-    if test "$NIX_STRIP_DEBUG" = "1"; then
-        # Add executable-stripping flags.
-        extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP)
-    fi
 fi
 
 # Optionally print debug info.

pkgs/build-support/gcc-upc-wrapper/gcc-wrapper.sh

@@ -95,11 +95,6 @@ if test "$dontLink" != "1"; then
 	fi
     done
     export NIX_LDFLAGS_SET=1
-
-    if test "$NIX_STRIP_DEBUG" = "1"; then
-        # Add executable-stripping flags.
-        extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP)
-    fi
 fi
 
 # As a very special hack, if the arguments are just `-v', then don't

pkgs/build-support/gcc-wrapper/gcc-wrapper.sh

@@ -103,11 +103,6 @@ if test "$dontLink" != "1"; then
 	fi
     done
     export NIX_LDFLAGS_SET=1
-
-    if test "$NIX_STRIP_DEBUG" = "1"; then
-        # Add executable-stripping flags.
-        extraAfter=(${extraAfter[@]} $NIX_CFLAGS_STRIP)
-    fi
 fi
 
 # As a very special hack, if the arguments are just `-v', then don't

pkgs/development/compilers/gcc-4.5/default.nix

@@ -391,7 +391,7 @@ stdenv.mkDerivation ({
 
 # GCC 4.5.2 doesn't support the `install-strip' target, so let `stdenv' do
 # the stripping by default.
-// optionalAttrs (!stripped) { dontStrip = true; NIX_STRIP_DEBUG = false; }
+// optionalAttrs (!stripped) { dontStrip = true; }
 
 // optionalAttrs langVhdl rec {
   name = "ghdl-0.29";

pkgs/development/compilers/gcc-4.6/default.nix

@@ -405,7 +405,7 @@ stdenv.mkDerivation ({
   installTargets = "install-gcc install-target-libgcc";
 }
 
-// optionalAttrs (!stripped) { dontStrip = true; NIX_STRIP_DEBUG = false; }
+// optionalAttrs (!stripped) { dontStrip = true; }
 
 // optionalAttrs langVhdl rec {
   name = "ghdl-0.29";

pkgs/games/trackballs/default.nix

@@ -1,8 +1,9 @@
-{stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image, guile,
+{ stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image, guile
-  debug ? false } :
+, debug ? false }:
 
 stdenv.mkDerivation rec {
   name = "trackballs-1.1.4";
+  
   src = fetchurl {
     url = mirror://sourceforge/trackballs/trackballs-1.1.4.tar.gz;
     sha256 = "19ilnif59sxa8xmfisk90wngrd11pj8s86ixzypv8krm4znbm7a5";
@@ -10,16 +11,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib mesa SDL SDL_ttf SDL_mixer SDL_image guile gettext ];
 
-  CFLAGS = if debug then "-g -O0" else null;
+  CFLAGS = optionalString debug "-g -O0";
   CXXFLAGS = CFLAGS;
-  NIX_STRIP_DEBUG = if debug then "0" else "1";
+  dontStrip = debug;
-  dontStrip = if debug then true else false;
+  postUnpack = optionalString debug
-  postUnpack = if debug then
+    "ensureDir $out/src; cp -R * $out/src ; cd $out/src";
-    "ensureDir $out/src; cp -R * $out/src ; cd $out/src"
-    else null;
 
-  NIX_CFLAGS_COMPILE="-iquote ${SDL}/include/SDL";
+  NIX_CFLAGS_COMPILE = "-iquote ${SDL}/include/SDL";
-  configureFlags = if debug then "--enable-debug" else null;
+  configureFlags = optionalString "--enable-debug";
 
   patchPhase = ''
     sed -i -e 's/images icons music/images music/' share/Makefile.in

pkgs/misc/misc.nix

@@ -113,7 +113,6 @@ in
 
     dontStrip = true;
 
-    NIX_STRIP_DEBUG=0;
     CFLAGS="-ggdb -O0";
     CXXFLAGS="-ggdb -O0";
 

pkgs/misc/uboot/default.nix

@@ -30,7 +30,6 @@ stdenv.mkDerivation {
   buildNativeInputs = [ unzip ];
 
   dontStrip = true;
-  NIX_STRIP_DEBUG = false;
 
   installPhase = ''
     ensureDir $out

pkgs/misc/uboot/guruplug.nix

@@ -42,7 +42,6 @@ stdenv.mkDerivation {
   buildNativeInputs = [ unzip ];
 
   dontStrip = true;
-  NIX_STRIP_DEBUG = false;
 
   installPhase = ''
     ensureDir $out

pkgs/misc/uboot/nanonote.nix

@@ -46,7 +46,6 @@ stdenv.mkDerivation {
   '';
 
   dontStrip = true;
-  NIX_STRIP_DEBUG = false;
 
   installPhase = ''
     ensureDir $out

pkgs/misc/uboot/sheevaplug.nix

@@ -45,7 +45,6 @@ stdenv.mkDerivation {
   buildNativeInputs = [ unzip ];
 
   dontStrip = true;
-  NIX_STRIP_DEBUG = false;
 
   installPhase = ''
     ensureDir $out

pkgs/stdenv/generic/docs.txt

@@ -1,93 +0,0 @@
-* genericBuild performs a generic build of (typically) autotool-style
-  packages
-
-  
-* unpack phase
-
-** may be overriden by setting $unpackPhase to point at a function that
-   unpacks the source (which should set $sourceRoot)
-
-** the generic unpacker unpacks all sources specified by $srcs, or
-   $src if $srcs is empty
-
-** supports tar, bzipped tar, gzipped tar, compressed tar, zip
-
-** zip must be in scope (in $buildinputs)
-
-** additional file types may be supported by setting $findUnpacker,
-   which is called with a single argument specifying the file to be
-   unpacked
-
-** $findUnpacker should set $unpackCmd, specifying the full command to
-   unpack the file (must include the file name)
-
-** alternatively, $unpackCmd can be set before calling the generic
-   builder (e.g., 'unpackCmd="unrar x $src"'); this only works if
-   there is a single source file
-
-** the generic unpacker then sets $sourceRoot to the name of the
-   directory created by unpacking the source archives
-
-** the source archives should produce only one directory
-
-** alternatively, $setSourceRoot may be set to a function that sets
-   $sourceRoot
-
-
-* the generic builder then chdirs to $sourceRoot
-
-
-* patch phase (skipped if neither $patchPhase nor $patches are set)
-
-** may be overriden by setting $patchPhase to point at a function that
-   unpacks the source (which should set $sourceRoot)
-
-** if the $patches variable is set, it runs `patch -p1 < ...' in
-   $sourceRoot for each element in $patches (the `patch' command
-   should be in $PATH; note that it isn't in the standard environment)
-
-
-* configuration phase
-
-** may be overriden by setting $configurePhase to point at a function
-
-** calls $preConfigurer first, if set (useful for running
-   autoconf/automake)
-
-** the configure script is specified by $configureScript, which
-   defaults to ./configure
-   
-** if no executable file exists at $configureScript, does nothing
-
-** if a file ./ltmain.sh exists and $dontFixLibtool is not set, calls
-   function fixLibtool to remove its default search path (/usr etc.)
-
-** adds "--prefix=$out" to $configureFlags unless $dontAddPrefix is
-   set
-
-** calls $configureScript with $configureFlags
-
-** calls $postConfigurer, if set (useful for any last-minute patches
-   prior to building)
-
-
-* build phase
-
-** may be overriden by setting $buildPhase to point at a function
-
-** runs make with flags $makeFlags
-
-
-* install phase
-
-** may be overriden by setting $installPhase to point at a function
-
-** runs make with flags $installFlags
-
-** unless $dontStrip is set or $NIX_STRIP_DEBUG is not 1, finds all *.a
-   files in $out and runs "strip -S" on them (executables and dynamic
-   libraries can be stripped automatically by setting NIX_STRIP_DEBUG
-   to 1 (default))
-
-** if $propagatedBuildInputs is set, its contents are written to
-   $out/nix-support/propagated-build-inputs

pkgs/stdenv/generic/setup.sh

@@ -237,13 +237,6 @@ if test "$NIX_NO_SELF_RPATH" != "1"; then
 fi
 
 
-# Strip debug information by default.
-if test -z "$NIX_STRIP_DEBUG"; then
-    export NIX_STRIP_DEBUG=1
-    export NIX_CFLAGS_STRIP="-g0 -Wl,--strip-debug"
-fi
-
-
 # Set the TZ (timezone) environment variable, otherwise commands like
 # `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must
 # be set--see zic manual page 2004').

pkgs/stdenv/linux/default.nix

@@ -5,7 +5,9 @@
 # ensuring purity of components produced by it.
 
 # The function defaults are for easy testing.
-{system ? "i686-linux", allPackages ? import ../../top-level/all-packages.nix, platform}:
+{ system ? "i686-linux"
+, allPackages ? import ../../top-level/all-packages.nix
+, platform ? null }:
 
 rec {
 

pkgs/stdenv/mingw/setup.sh

@@ -202,13 +202,6 @@ if test "$NIX_NO_SELF_RPATH" != "1"; then
 fi
 
 
-# Strip debug information by default.
-if test -z "$NIX_STRIP_DEBUG"; then
-    export NIX_STRIP_DEBUG=1
-    export NIX_CFLAGS_STRIP="-g0 -Wl,--strip-debug"
-fi
-
-
 # Set the TZ (timezone) environment variable, otherwise commands like
 # `date' will complain (e.g., `Tue Mar 9 10:01:47 Local time zone must
 # be set--see zic manual page 2004').

pkgs/stdenv/native/default.nix

@@ -19,7 +19,6 @@ rec {
     export NIX_DONT_SET_RPATH=1
     export NIX_NO_SELF_RPATH=1
     dontFixLibtool=1
-    NIX_STRIP_DEBUG=0
     stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" 
   '';
 

pkgs/stdenv/nix/prehook.sh

@@ -5,7 +5,6 @@ if test "$system" = "i686-darwin" -o "$system" = "powerpc-darwin" -o "$system" =
     export NIX_DONT_SET_RPATH=1
     export NIX_NO_SELF_RPATH=1
     dontFixLibtool=1
-    NIX_STRIP_DEBUG=0 # !!! do we still need this?
     stripAllFlags=" " # the Darwin "strip" command doesn't know "-s" 
     xargsFlags=" "
 fi

pkgs/tools/package-management/disnix/default.nix

@@ -1,16 +1,18 @@
-{stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv}:
+{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv }:
 
 stdenv.mkDerivation {
   name = "disnix-0.3pre29816";
+  
   src = fetchurl {
     url = http://hydra.nixos.org/build/1453079/download/4/disnix-0.3pre29816.tar.gz;
     sha256 = "13gi0zs0a8pvgmgh3h431ydran3qf3px5m3d6vddd9b225kbkgwz";
   };
+  
   buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]
                 ++ stdenv.lib.optional (!stdenv.isLinux) libiconv
 		++ stdenv.lib.optional (!stdenv.isLinux) gettext;
+                
   dontStrip = true;
-  NIX_STRIP_DEBUG = true;
   
   meta = {
     description = "A distributed deployment extension for Nix";

pkgs/tools/package-management/disnix/disnixos/default.nix

@@ -1,14 +1,16 @@
-{stdenv, fetchurl, disnix, socat, pkgconfig}:
+{ stdenv, fetchurl, disnix, socat, pkgconfig }:
 
 stdenv.mkDerivation {
   name = "disnixos-0.2pre29928";
+  
   src = fetchurl {
     url = http://hydra.nixos.org/build/1464065/download/3/disnixos-0.2pre29928.tar.gz;
     sha256 = "0l7kszbpi8lzq95khi45fbq71l5csf8kamds4va6bxsyfwxrx6sm";
   };
+  
   buildInputs = [ socat pkgconfig disnix ];
+  
   dontStrip = true;
-  NIX_STRIP_DEBUG = true;
   
   meta = {
     description = "Provides complementary NixOS infrastructure deployment to Disnix";