Author: eelco Date: Sun Jul 25 09:09:32 2010 New Revision: 22726 URL: https://svn.nixos.org/websvn/nix/?rev=22726&sc=1
Log: * On x86_64-darwin, "./config" misdetects the system as "darwin-i386-cc" (http://hydra.nixos.org/build/498076). So specify the system type explicitly. Modified: nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/default.nix Modified: nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/default.nix ============================================================================== --- nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/default.nix Sat Jul 24 22:05:27 2010 (r22725) +++ nixpkgs/branches/x-updates/pkgs/development/libraries/openssl/default.nix Sun Jul 25 09:09:32 2010 (r22726) @@ -17,8 +17,11 @@ patches = stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; buildNativeInputs = [ perl ]; - - configureScript = "./config"; + + # On x86_64-darwin, "./config" misdetects the system as + # "darwin-i386-cc". So specify the system type explicitly. + configureScript = + if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config"; configureFlags = "shared --libdir=lib"; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
