diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-03-24 12:25:19 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-03-24 12:25:19 +0000 |
| commit | 09a9cae7153eb4212862c95d90a88994d3383a45 (patch) | |
| tree | a4b94c84563f58efb852c6969ee050e2b233e995 /pkgs/build-support | |
| parent | 0b81c9f7d4263c58fd25b4c46a91e3dd90d41306 (diff) | |
| parent | 211f29fe28426337eb05eb86ab52885cbc58ab0f (diff) | |
* Merged the usability branch (from trunk@4749 to branches/usability@5087).
svn path=/nixpkgs/trunk/; revision=5088
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/gcc-cross-wrapper/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/default.nix | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix index 0ceab44ee27c3..09f7f006928e3 100644 --- a/pkgs/build-support/gcc-cross-wrapper/default.nix +++ b/pkgs/build-support/gcc-cross-wrapper/default.nix @@ -27,4 +27,7 @@ stdenv.mkDerivation { langCC = if nativeTools then true else gcc.langCC; langF77 = if nativeTools then false else gcc.langF77; shell = if shell == "" then stdenv.shell else shell; + meta = if gcc != null then gcc.meta else + { description = "System C compiler wrapper"; + }; } diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index 4296aef67c8bc..22d0239512930 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -27,4 +27,7 @@ stdenv.mkDerivation { langCC = if nativeTools then true else gcc.langCC; langF77 = if nativeTools then false else gcc.langF77; shell = if shell == "" then stdenv.shell else shell; + meta = if gcc != null then gcc.meta else + { description = "System C compiler wrapper"; + }; } |