summary refs log tree commit diff
path: root/pkgs/development/tools/phantomjs2
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-01-13 08:31:37 +0100
committerVladimír Čunát <vcunat@gmail.com>2016-01-13 08:34:35 +0100
commitcea8ee50c7de8106d74ed66a9b54db56e3ab491e (patch)
tree6ffc08b68659c88a7d199493add9187d00a4777a /pkgs/development/tools/phantomjs2
parente6a892bb55e664a7ac151855fefb579812c66e60 (diff)
downloadnixlib-cea8ee50c7de8106d74ed66a9b54db56e3ab491e.tar
nixlib-cea8ee50c7de8106d74ed66a9b54db56e3ab491e.tar.gz
nixlib-cea8ee50c7de8106d74ed66a9b54db56e3ab491e.tar.bz2
nixlib-cea8ee50c7de8106d74ed66a9b54db56e3ab491e.tar.lz
nixlib-cea8ee50c7de8106d74ed66a9b54db56e3ab491e.tar.xz
nixlib-cea8ee50c7de8106d74ed66a9b54db56e3ab491e.tar.zst
nixlib-cea8ee50c7de8106d74ed66a9b54db56e3ab491e.zip
phantomjs2: fix evaluation and refactor
The error was due to the fact that with-introduced bindings have lower
priority and we do have `darwin` in scope already.

Fixes #12350. Closes #12351. (A slightly different fix.
I chose this to lower the risk of people re-introducing the mistake.)
Diffstat (limited to 'pkgs/development/tools/phantomjs2')
-rw-r--r--pkgs/development/tools/phantomjs2/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index 8c162589bf6e..a0f919b404f3 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -94,7 +94,7 @@ in stdenv.mkDerivation rec {
     $out/bin/phantomjs
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Headless WebKit with JavaScript API";
     longDescription = ''
       PhantomJS2 is a headless WebKit with JavaScript API.
@@ -109,9 +109,9 @@ in stdenv.mkDerivation rec {
     '';
 
     homepage = http://phantomjs.org/;
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
 
-    maintainers = [ stdenv.lib.maintainers.aflatter ];
-    platforms = with stdenv.lib.platforms; darwin ++ linux;
+    maintainers = [ maintainers.aflatter ];
+    platforms = platforms.darwin ++ platforms.linux;
   };
 }