diff options
author | Shea Levy <shea@shealevy.com> | 2013-08-20 18:36:39 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2013-08-20 18:56:20 -0400 |
commit | 9c9b7a427b40d46f4aac26b7a4cfe64709206207 (patch) | |
tree | 2fe79d730adeddb71799300b69e92c29aa72f708 /pkgs | |
parent | 8cd9be89fd77d3ca3ea242cefb07e77c3068b96d (diff) | |
download | nixlib-9c9b7a427b40d46f4aac26b7a4cfe64709206207.tar nixlib-9c9b7a427b40d46f4aac26b7a4cfe64709206207.tar.gz nixlib-9c9b7a427b40d46f4aac26b7a4cfe64709206207.tar.bz2 nixlib-9c9b7a427b40d46f4aac26b7a4cfe64709206207.tar.lz nixlib-9c9b7a427b40d46f4aac26b7a4cfe64709206207.tar.xz nixlib-9c9b7a427b40d46f4aac26b7a4cfe64709206207.tar.zst nixlib-9c9b7a427b40d46f4aac26b7a4cfe64709206207.zip |
Update phantomjs
Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/tools/phantomjs/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 5d9433cc5ca6..e17038692f57 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, upx, freetype, fontconfig }: +{ stdenv, fetchurl, freetype, fontconfig }: assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" ]; stdenv.mkDerivation rec { - name = "phantomjs-1.7.0"; + name = "phantomjs-1.9.1"; # I chose to use the binary build for now. # The source version is quite nasty to compile @@ -13,19 +13,15 @@ stdenv.mkDerivation rec { src = if stdenv.system == "i686-linux" then fetchurl { url = "http://phantomjs.googlecode.com/files/${name}-linux-i686.tar.bz2"; - sha256 = "045d80lymjxnsssa0sgp5pgkahm651jk69ibk3mjczk3ykc1k91f"; + sha256 = "1r4ssx6v0ah18jy3vjswhki2i21r45qbs1jzh4x672wdc9lxz2p6"; } else # x86_64-linux fetchurl { url = "http://phantomjs.googlecode.com/files/${name}-linux-x86_64.tar.bz2"; - sha256 = "1m14czhi3b388didn0a881glsx8bnsg9gnxgj5lghr4l5mgqyrd7"; + sha256 = "1l7hlhspzw3zzsgz9cq0a3j26giynjicvb6y96fj3ipkn4shznnn"; }; - nativeBuildInputs = stdenv.lib.optional (stdenv.system == "x86_64-linux") upx; - - buildPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' - upx -d bin/phantomjs - '' + '' + buildPhase = '' patchelf \ --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath ${freetype}/lib:${fontconfig}/lib:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib \ |