diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 12:23:02 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 12:23:56 +0200 |
commit | f8c211fd2b53d970a439d643bea9d0928fb08666 (patch) | |
tree | 5084d953ed0e15e81e556c5db1399143c8069fc8 /pkgs/development/tools/phantomjs | |
parent | 32b31398eb562152a11d1be992c5ea6e110013f5 (diff) | |
download | nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.gz nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.bz2 nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.lz nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.xz nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.tar.zst nixlib-f8c211fd2b53d970a439d643bea9d0928fb08666.zip |
fontconfig: split into multiple outputs
Fixed all 'fontconfig}' references as well, hopefully, ugh!
Diffstat (limited to 'pkgs/development/tools/phantomjs')
-rw-r--r-- | pkgs/development/tools/phantomjs/default.nix | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 77bc1e5a885f..8b6b655b6a56 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchurl, freetype, fontconfig, openssl, unzip }: +{ stdenv, lib, fetchurl, freetype, fontconfig, openssl, unzip }: -assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; +let + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; +in +assert lib.elem stdenv.system platforms; stdenv.mkDerivation rec { name = "phantomjs-1.9.8"; @@ -27,12 +30,12 @@ stdenv.mkDerivation rec { sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg"; }; - buildInputs = if stdenv.isDarwin then [ unzip ] else []; + buildInputs = lib.optional stdenv.isDarwin unzip; - buildPhase = if stdenv.isDarwin then "" else '' + buildPhase = lib.optionalString (!stdenv.isDarwin) '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${freetype}/lib:${fontconfig}/lib:${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${openssl}/lib" \ + --set-rpath "${stdenv.lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \ bin/phantomjs ''; @@ -60,9 +63,9 @@ stdenv.mkDerivation rec { ''; homepage = http://phantomjs.org/; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" ]; + maintainers = [ lib.maintainers.bluescreen303 ]; + inherit platforms; }; } |