[Nix-commits] SVN commit: nix - r27572 - in nixpkgs/trunk/pkgs/development/libraries: boehm-gc gmp libffi libunistring readline

[Ludovic Courtès]

Author: ludo
Date: Fri Jul  1 13:20:12 2011
New Revision: 27572
URL: https://svn.nixos.org/websvn/nix/?rev=27572&sc=1

Log:
BDW-GC, GMP, libffi, libunistring, Readline: Don't use the native `strip'.

Using the native `strip' breaks static libraries when cross-compiling.

Modified:
   nixpkgs/trunk/pkgs/development/libraries/boehm-gc/default.nix
   nixpkgs/trunk/pkgs/development/libraries/gmp/4.nix
   nixpkgs/trunk/pkgs/development/libraries/libffi/default.nix
   nixpkgs/trunk/pkgs/development/libraries/libunistring/default.nix
   nixpkgs/trunk/pkgs/development/libraries/readline/readline6.nix

Modified: nixpkgs/trunk/pkgs/development/libraries/boehm-gc/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/boehm-gc/default.nix       Fri Jul 
 1 10:11:06 2011        (r27571)
+++ nixpkgs/trunk/pkgs/development/libraries/boehm-gc/default.nix       Fri Jul 
 1 13:20:12 2011        (r27572)
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "boehm-gc-7.2pre20110122";
 
   src = fetchurl {
@@ -41,3 +41,10 @@
     platforms = stdenv.lib.platforms.all;
   };
 }
+
+//
+
+# Don't run the native `strip' when cross-compiling.
+(if (stdenv ? cross)
+ then { dontStrip = true; }
+ else { }))

Modified: nixpkgs/trunk/pkgs/development/libraries/gmp/4.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/gmp/4.nix  Fri Jul  1 10:11:06 
2011        (r27571)
+++ nixpkgs/trunk/pkgs/development/libraries/gmp/4.nix  Fri Jul  1 13:20:12 
2011        (r27572)
@@ -4,7 +4,7 @@
   staticFlags = if static then " --enable-static --disable-shared" else "";
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "gmp-4.3.2";
 
   src = fetchurl {
@@ -64,3 +64,10 @@
     platforms = stdenv.lib.platforms.all;
   };
 }
+
+//
+
+# Don't run the native `strip' when cross-compiling.
+(if (stdenv ? cross)
+ then { dontStrip = true; }
+ else { }))

Modified: nixpkgs/trunk/pkgs/development/libraries/libffi/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libffi/default.nix Fri Jul  1 
10:11:06 2011        (r27571)
+++ nixpkgs/trunk/pkgs/development/libraries/libffi/default.nix Fri Jul  1 
13:20:12 2011        (r27572)
@@ -1,6 +1,6 @@
 { fetchurl, stdenv }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "libffi-3.0.9";
 
   src = fetchurl {
@@ -42,3 +42,10 @@
     platforms = stdenv.lib.platforms.all;
   };
 }
+
+//
+
+# Don't run the native `strip' when cross-compiling.
+(if (stdenv ? cross)
+ then { dontStrip = true; }
+ else { }))

Modified: nixpkgs/trunk/pkgs/development/libraries/libunistring/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libunistring/default.nix   Fri Jul 
 1 10:11:06 2011        (r27571)
+++ nixpkgs/trunk/pkgs/development/libraries/libunistring/default.nix   Fri Jul 
 1 13:20:12 2011        (r27572)
@@ -55,4 +55,11 @@
 # can't find the dll, it will only create a static library.
 (if (stdenv ? glibc)
  then {}
- else { configureFlags = "--with-libiconv-prefix=${libiconv}"; }))
+ else { configureFlags = "--with-libiconv-prefix=${libiconv}"; })
+
+//
+
+# Don't run the native `strip' when cross-compiling.
+(if (stdenv ? cross)
+ then { dontStrip = true; }
+ else { }))

Modified: nixpkgs/trunk/pkgs/development/libraries/readline/readline6.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/readline/readline6.nix     Fri Jul 
 1 10:11:06 2011        (r27571)
+++ nixpkgs/trunk/pkgs/development/libraries/readline/readline6.nix     Fri Jul 
 1 13:20:12 2011        (r27572)
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, ncurses }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "readline-6.1";
 
   src = fetchurl {
@@ -48,3 +48,10 @@
     maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
+
+//
+
+# Don't run the native `strip' when cross-compiling.
+(if (stdenv ? cross)
+ then { dontStrip = true; }
+ else { }))
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits