Author: eelco
Date: Mon Dec 12 14:02:12 2011
New Revision: 30848
URL: https://nixos.org/websvn/nix/?rev=30848&sc=1
Log:
* Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing
in its interaction with the ‘dontStrip’ attribute.
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/docs.txt
Modified:
nixpkgs/branches/stdenv-updates/pkgs/build-support/clang-wrapper/clang-wrapper.sh
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-upc-wrapper/gcc-wrapper.sh
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix
nixpkgs/branches/stdenv-updates/pkgs/games/trackballs/default.nix
nixpkgs/branches/stdenv-updates/pkgs/misc/misc.nix
nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/default.nix
nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/guruplug.nix
nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/nanonote.nix
nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/sheevaplug.nix
nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh
nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix
nixpkgs/branches/stdenv-updates/pkgs/stdenv/mingw/setup.sh
nixpkgs/branches/stdenv-updates/pkgs/stdenv/native/default.nix
nixpkgs/branches/stdenv-updates/pkgs/stdenv/nix/prehook.sh
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/default.nix
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/disnixos/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/build-support/clang-wrapper/clang-wrapper.sh
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/build-support/clang-wrapper/clang-wrapper.sh
Mon Dec 12 13:45:24 2011 (r30847)
+++
nixpkgs/branches/stdenv-updates/pkgs/build-support/clang-wrapper/clang-wrapper.sh
Mon Dec 12 14:02:12 2011 (r30848)
@@ -103,11 +103,6 @@
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
Modified:
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
Mon Dec 12 13:45:24 2011 (r30847)
+++
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
Mon Dec 12 14:02:12 2011 (r30848)
@@ -89,11 +89,6 @@
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.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-upc-wrapper/gcc-wrapper.sh
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-upc-wrapper/gcc-wrapper.sh
Mon Dec 12 13:45:24 2011 (r30847)
+++
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-upc-wrapper/gcc-wrapper.sh
Mon Dec 12 14:02:12 2011 (r30848)
@@ -95,11 +95,6 @@
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
Modified:
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
Mon Dec 12 13:45:24 2011 (r30847)
+++
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
Mon Dec 12 14:02:12 2011 (r30848)
@@ -103,11 +103,6 @@
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
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
Mon Dec 12 13:45:24 2011 (r30847)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/default.nix
Mon Dec 12 14:02:12 2011 (r30848)
@@ -391,7 +391,7 @@
# 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";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix
Mon Dec 12 13:45:24 2011 (r30847)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/default.nix
Mon Dec 12 14:02:12 2011 (r30848)
@@ -405,7 +405,7 @@
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";
Modified: nixpkgs/branches/stdenv-updates/pkgs/games/trackballs/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/games/trackballs/default.nix Mon Dec
12 13:45:24 2011 (r30847)
+++ nixpkgs/branches/stdenv-updates/pkgs/games/trackballs/default.nix Mon Dec
12 14:02:12 2011 (r30848)
@@ -1,8 +1,9 @@
-{stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image,
guile,
- debug ? false } :
+{ stdenv, fetchurl, SDL, mesa, SDL_ttf, gettext, zlib, SDL_mixer, SDL_image,
guile
+, 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 @@
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 = if debug then true else false;
- postUnpack = if debug then
- "ensureDir $out/src; cp -R * $out/src ; cd $out/src"
- else null;
+ dontStrip = debug;
+ postUnpack = optionalString debug
+ "ensureDir $out/src; cp -R * $out/src ; cd $out/src";
- NIX_CFLAGS_COMPILE="-iquote ${SDL}/include/SDL";
- configureFlags = if debug then "--enable-debug" else null;
+ NIX_CFLAGS_COMPILE = "-iquote ${SDL}/include/SDL";
+ configureFlags = optionalString "--enable-debug";
patchPhase = ''
sed -i -e 's/images icons music/images music/' share/Makefile.in
Modified: nixpkgs/branches/stdenv-updates/pkgs/misc/misc.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/misc/misc.nix Mon Dec 12 13:45:24
2011 (r30847)
+++ nixpkgs/branches/stdenv-updates/pkgs/misc/misc.nix Mon Dec 12 14:02:12
2011 (r30848)
@@ -113,7 +113,6 @@
dontStrip = true;
- NIX_STRIP_DEBUG=0;
CFLAGS="-ggdb -O0";
CXXFLAGS="-ggdb -O0";
Modified: nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/default.nix Mon Dec 12
13:45:24 2011 (r30847)
+++ nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/default.nix Mon Dec 12
14:02:12 2011 (r30848)
@@ -30,7 +30,6 @@
buildNativeInputs = [ unzip ];
dontStrip = true;
- NIX_STRIP_DEBUG = false;
installPhase = ''
ensureDir $out
Modified: nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/guruplug.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/guruplug.nix Mon Dec
12 13:45:24 2011 (r30847)
+++ nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/guruplug.nix Mon Dec
12 14:02:12 2011 (r30848)
@@ -42,7 +42,6 @@
buildNativeInputs = [ unzip ];
dontStrip = true;
- NIX_STRIP_DEBUG = false;
installPhase = ''
ensureDir $out
Modified: nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/nanonote.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/nanonote.nix Mon Dec
12 13:45:24 2011 (r30847)
+++ nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/nanonote.nix Mon Dec
12 14:02:12 2011 (r30848)
@@ -46,7 +46,6 @@
'';
dontStrip = true;
- NIX_STRIP_DEBUG = false;
installPhase = ''
ensureDir $out
Modified: nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/sheevaplug.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/sheevaplug.nix Mon Dec
12 13:45:24 2011 (r30847)
+++ nixpkgs/branches/stdenv-updates/pkgs/misc/uboot/sheevaplug.nix Mon Dec
12 14:02:12 2011 (r30848)
@@ -45,7 +45,6 @@
buildNativeInputs = [ unzip ];
dontStrip = true;
- NIX_STRIP_DEBUG = false;
installPhase = ''
ensureDir $out
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh Mon Dec
12 13:45:24 2011 (r30847)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh Mon Dec
12 14:02:12 2011 (r30848)
@@ -237,13 +237,6 @@
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').
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Mon Dec
12 13:45:24 2011 (r30847)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Mon Dec
12 14:02:12 2011 (r30848)
@@ -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 {
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/mingw/setup.sh
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/mingw/setup.sh Mon Dec 12
13:45:24 2011 (r30847)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/mingw/setup.sh Mon Dec 12
14:02:12 2011 (r30848)
@@ -202,13 +202,6 @@
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').
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/native/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/native/default.nix Mon Dec
12 13:45:24 2011 (r30847)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/native/default.nix Mon Dec
12 14:02:12 2011 (r30848)
@@ -19,7 +19,6 @@
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"
'';
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/nix/prehook.sh
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/nix/prehook.sh Mon Dec 12
13:45:24 2011 (r30847)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/nix/prehook.sh Mon Dec 12
14:02:12 2011 (r30848)
@@ -5,7 +5,6 @@
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
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/default.nix
Mon Dec 12 13:45:24 2011 (r30847)
+++
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/default.nix
Mon Dec 12 14:02:12 2011 (r30848)
@@ -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";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/disnixos/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/disnixos/default.nix
Mon Dec 12 13:45:24 2011 (r30847)
+++
nixpkgs/branches/stdenv-updates/pkgs/tools/package-management/disnix/disnixos/default.nix
Mon Dec 12 14:02:12 2011 (r30848)
@@ -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";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
