diff options
| author | cillianderoiste <cillian.deroiste@gmail.com> | 2014-02-12 01:55:55 +0100 |
|---|---|---|
| committer | cillianderoiste <cillian.deroiste@gmail.com> | 2014-02-12 01:55:55 +0100 |
| commit | ffd1e8865155221aad8332e255ae8960f3e89ca6 (patch) | |
| tree | f7cdf6d6a854f002ca784081793a776c30288453 /pkgs | |
| parent | 19757df9dc2220019eca3bb744cba4cd295d4166 (diff) | |
| parent | 671a36963436508757c74f12ddcfd1ac78842332 (diff) | |
| download | nixlib-ffd1e8865155221aad8332e255ae8960f3e89ca6.tar nixlib-ffd1e8865155221aad8332e255ae8960f3e89ca6.tar.gz nixlib-ffd1e8865155221aad8332e255ae8960f3e89ca6.tar.bz2 nixlib-ffd1e8865155221aad8332e255ae8960f3e89ca6.tar.lz nixlib-ffd1e8865155221aad8332e255ae8960f3e89ca6.tar.xz nixlib-ffd1e8865155221aad8332e255ae8960f3e89ca6.tar.zst nixlib-ffd1e8865155221aad8332e255ae8960f3e89ca6.zip | |
Merge pull request #1732 from garbas/phantomjs-on-darwin
phantomjs on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/phantomjs/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 22 insertions, 10 deletions
diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index ef07d04212bc..6fc53595efbd 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, freetype, fontconfig, openssl }: +{ stdenv, fetchurl, freetype, fontconfig, openssl, unzip }: -assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" ]; +assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; stdenv.mkDerivation rec { name = "phantomjs-1.9.7"; @@ -15,13 +15,21 @@ stdenv.mkDerivation rec { url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-i686.tar.bz2"; sha256 = "1ffd5544wnkww5cgwsims4bk4bymvm6pm19p32nbhwabxqhbnj9a"; } - else # x86_64-linux - fetchurl { - url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2"; - sha256 = "06mhvj8rx298j0mrijw48zfm28hqgy81vdr1vv0jp4ncxbvijfs7"; - }; + else + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-linux-x86_64.tar.bz2"; + sha256 = "06mhvj8rx298j0mrijw48zfm28hqgy81vdr1vv0jp4ncxbvijfs7"; + } + else # x86_64-darwin + fetchurl { + url = "https://bitbucket.org/ariya/phantomjs/downloads/${name}-macosx.zip"; + sha256 = "0vsagvx181gnypi6kgmxp4br6hnvd81vyy3cbz5pxccdys7iywvj"; + }; + + buildInputs = if stdenv.isDarwin then [ unzip ] else []; - buildPhase = '' + buildPhase = if stdenv.isDarwin then "" else '' patchelf \ --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath "${freetype}/lib:${fontconfig}/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${openssl}/lib" \ @@ -55,6 +63,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = ["i686-linux" "x86_64-linux" ]; + platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 735b561c1323..13de0149ed85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3685,7 +3685,11 @@ let peg = callPackage ../development/tools/parsing/peg { }; - phantomjs = callPackage ../development/tools/phantomjs { }; + phantomjs = callPackage ../development/tools/phantomjs { + stdenv = if stdenv.isDarwin + then overrideGCC stdenv gccApple + else stdenv; + }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; |