Author: shlevy Date: Tue Aug 30 13:46:05 2011 New Revision: 28929 URL: https://svn.nixos.org/websvn/nix/?rev=28929&sc=1
Log: gcc-apple64: Enable Objective C darwin-updates was just merged, so I'm taking the liberty of messing with darwin's stdenv Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-apple64/builder.sh nixpkgs/trunk/pkgs/development/compilers/gcc-apple64/default.nix Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-apple64/builder.sh ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/gcc-apple64/builder.sh Tue Aug 30 13:25:23 2011 (r28928) +++ nixpkgs/trunk/pkgs/development/compilers/gcc-apple64/builder.sh Tue Aug 30 13:46:05 2011 (r28929) @@ -61,6 +61,9 @@ if test -n "$langF77"; then langs="$langs,f95" fi + if test -n "$langObjC"; then + langs="$langs,objc" + fi # Perform the build in a different directory. mkdir ../build Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-apple64/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/development/compilers/gcc-apple64/default.nix Tue Aug 30 13:25:23 2011 (r28928) +++ nixpkgs/trunk/pkgs/development/compilers/gcc-apple64/default.nix Tue Aug 30 13:46:05 2011 (r28929) @@ -1,5 +1,5 @@ { stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langF77 ? false +, langC ? true, langCC ? true, langObjC ? true, langF77 ? false , profiledCompiler ? false , gmp ? null, mpfr ? null, bison ? null, flex ? null }: @@ -34,5 +34,5 @@ patches = [./pass-cxxcpp.patch ] ++ (if noSysDirs then [./no-sys-dirs.patch] else []); - inherit noSysDirs langC langCC langF77 profiledCompiler; + inherit noSysDirs langC langCC langF77 langObjC profiledCompiler; } // (if langF77 then {buildInputs = [gmp mpfr bison flex];} else {})) _______________________________________________ nix-commits mailing list nix-comm...@cs.uu.nl http://mail.cs.uu.nl/mailman/listinfo/nix-commits