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

pkgs/stdenv/generic: cosmetic changes

Browse Source 
svn path=/nixpkgs/trunk/; revision=23361
This commit is contained in:
Peter Simons 2010-08-23 14:40:37 +00:00
parent eb9c20eaf3
commit 960323ec73
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/stdenv/generic/default.nix
View File

@ -39,7 +39,7 @@ let
meta = { meta = {
description = "The default build environment for Unix packages in Nixpkgs"; description = "The default build environment for Unix packages in Nixpkgs";
}; };
# Add a utility function to produce derivations that use this # Add a utility function to produce derivations that use this
# stdenv and its shell. # stdenv and its shell.
mkDerivation = attrs: mkDerivation = attrs:
@ -90,7 +90,9 @@ let
(if attrs ? passthru then attrs.passthru else {}); (if attrs ? passthru then attrs.passthru else {});
# Utility flags to test the type of platform. # Utility flags to test the type of platform.
isDarwin = result.system == "i686-darwin" || result.system == "powerpc-darwin" || result.system == "x86_64-darwin"; isDarwin = result.system == "i686-darwin"
|| result.system == "powerpc-darwin"
|| result.system == "x86_64-darwin";
isLinux = result.system == "i686-linux" isLinux = result.system == "i686-linux"
|| result.system == "x86_64-linux" || result.system == "x86_64-linux"
|| result.system == "powerpc-linux" || result.system == "powerpc-linux"
@ -139,5 +141,5 @@ let
}.result; }.result;
in stdenvGenerator ./setup.sh in stdenvGenerator ./setup.sh