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

some more x86_64 darwin changes

Browse Source 
svn path=/nixpkgs/trunk/; revision=18774
This commit is contained in:
Rob Vermaas 2009-12-02 22:19:49 +00:00
parent 0b20c5c38f
commit af84eef331
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/top-level/all-packages.nix
View File

@ -573,7 +573,7 @@ let
inherit fetchurl stdenv texinfo perl inherit fetchurl stdenv texinfo perl
gnused groff libxml2 libxslt makeWrapper; gnused groff libxml2 libxslt makeWrapper;
inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport; inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport;
libiconv = if system == "i686-darwin" then libiconv else null; libiconv = if stdenv.isDarwin then libiconv else null;
}; };
dosfstools = composedArgsAndFun (import ../tools/misc/dosfstools) { dosfstools = composedArgsAndFun (import ../tools/misc/dosfstools) {
@ -641,7 +641,7 @@ let
}; };
findutils = useFromStdenv "findutils" findutils = useFromStdenv "findutils"
(if system == "i686-darwin" then findutils4227 else (if stdenv.isDarwin then findutils4227 else
import ../tools/misc/findutils { import ../tools/misc/findutils {
inherit fetchurl stdenv coreutils; inherit fetchurl stdenv coreutils;
} }
@ -4108,6 +4108,7 @@ let
mesaSupported = mesaSupported =
system == "i686-linux" || system == "i686-linux" ||
system == "x86_64-linux" || system == "x86_64-linux" ||
system == "x86_64-darwin" ||
system == "i686-darwin"; system == "i686-darwin";
mesa = import ../development/libraries/mesa { mesa = import ../development/libraries/mesa {
@ -5189,7 +5190,7 @@ let
inherit devicemapper; inherit devicemapper;
}; };
libuuid = if stdenv.system != "i686-darwin" then utillinuxng else null; libuuid = if ! stdenv.isDarwin then utillinuxng else null;
e2fsprogs = import ../os-specific/linux/e2fsprogs { e2fsprogs = import ../os-specific/linux/e2fsprogs {
inherit fetchurl stdenv pkgconfig libuuid; inherit fetchurl stdenv pkgconfig libuuid;
@ -6533,7 +6534,7 @@ let
libpng libjpeg libungif libtiff texinfo dbus; libpng libjpeg libungif libtiff texinfo dbus;
inherit (xlibs) libXaw libXpm libXft; inherit (xlibs) libXaw libXpm libXft;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
xawSupport = system == "i686-darwin" || getPkgConfig "emacs" "xawSupport" false; xawSupport = stdenv.isDarwin || getPkgConfig "emacs" "xawSupport" false;
xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false; xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false;
gtkGUI = getPkgConfig "emacs" "gtkSupport" true; gtkGUI = getPkgConfig "emacs" "gtkSupport" true;
xftSupport = getPkgConfig "emacs" "xftSupport" true; xftSupport = getPkgConfig "emacs" "xftSupport" true;
@ -7373,7 +7374,7 @@ let
rsync = import ../applications/networking/sync/rsync { rsync = import ../applications/networking/sync/rsync {
inherit fetchurl stdenv acl; inherit fetchurl stdenv acl;
enableACLs = system != "i686-darwin"; enableACLs = !stdenv.isDarwin;
}; };
rxvt = import ../applications/misc/rxvt { rxvt = import ../applications/misc/rxvt {