diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2009-12-02 22:19:49 +0000 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2009-12-02 22:19:49 +0000 |
| commit | af84eef331a3e9352bbef5550be272d5053f3710 (patch) | |
| tree | ed6817389283e7612ee53edb9e232dfee82beb16 | |
| parent | 0b20c5c38f361841878234c1da75563a590deaac (diff) | |
| download | nixlib-af84eef331a3e9352bbef5550be272d5053f3710.tar nixlib-af84eef331a3e9352bbef5550be272d5053f3710.tar.gz nixlib-af84eef331a3e9352bbef5550be272d5053f3710.tar.bz2 nixlib-af84eef331a3e9352bbef5550be272d5053f3710.tar.lz nixlib-af84eef331a3e9352bbef5550be272d5053f3710.tar.xz nixlib-af84eef331a3e9352bbef5550be272d5053f3710.tar.zst nixlib-af84eef331a3e9352bbef5550be272d5053f3710.zip | |
some more x86_64 darwin changes
svn path=/nixpkgs/trunk/; revision=18774
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c0347463c29..bdeb770d2cac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -573,7 +573,7 @@ let inherit fetchurl stdenv texinfo perl gnused groff libxml2 libxslt makeWrapper; 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) { @@ -641,7 +641,7 @@ let }; findutils = useFromStdenv "findutils" - (if system == "i686-darwin" then findutils4227 else + (if stdenv.isDarwin then findutils4227 else import ../tools/misc/findutils { inherit fetchurl stdenv coreutils; } @@ -4108,6 +4108,7 @@ let mesaSupported = system == "i686-linux" || system == "x86_64-linux" || + system == "x86_64-darwin" || system == "i686-darwin"; mesa = import ../development/libraries/mesa { @@ -5189,7 +5190,7 @@ let 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 { inherit fetchurl stdenv pkgconfig libuuid; @@ -6533,7 +6534,7 @@ let libpng libjpeg libungif libtiff texinfo dbus; inherit (xlibs) libXaw libXpm libXft; inherit (gtkLibs) gtk; - xawSupport = system == "i686-darwin" || getPkgConfig "emacs" "xawSupport" false; + xawSupport = stdenv.isDarwin || getPkgConfig "emacs" "xawSupport" false; xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false; gtkGUI = getPkgConfig "emacs" "gtkSupport" true; xftSupport = getPkgConfig "emacs" "xftSupport" true; @@ -7373,7 +7374,7 @@ let rsync = import ../applications/networking/sync/rsync { inherit fetchurl stdenv acl; - enableACLs = system != "i686-darwin"; + enableACLs = !stdenv.isDarwin; }; rxvt = import ../applications/misc/rxvt { |