From cea8ee50c7de8106d74ed66a9b54db56e3ab491e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 13 Jan 2016 08:31:37 +0100 Subject: [PATCH] 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.) --- pkgs/development/tools/phantomjs2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index 8c162589bf6..a0f919b404f 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; }; }