public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing

Browse Source 
in its interaction with the ‘dontStrip’ attribute.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30848
This commit is contained in:
Eelco Dolstra
2011-12-12 14:02:12 +00:00
parent ef7b97bade
commit 3ea1c30846
20 changed files with 22 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/trackballs/default.nix
+9 -10
View File
@@ -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 @@ 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 = 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