Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'

1 files changed, 23 insertions, 27 deletions

diff --git a/nixpkgs/pkgs/development/tools/wp-cli/default.nix b/nixpkgs/pkgs/development/tools/wp-cli/default.nix
index c6c001143a95..14e55f99e0bd 100644
--- a/nixpkgs/pkgs/development/tools/wp-cli/default.nix
+++ b/nixpkgs/pkgs/development/tools/wp-cli/default.nix
@@ -1,53 +1,49 @@
-{ stdenv, lib, fetchurl, php, runtimeShell }:
+{ stdenv, lib, fetchurl, writeText, php, makeWrapper }:
 
 let
-  version = "2.0.1";
+  version = "2.2.0";
 
   completion = fetchurl {
     url    = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash";
     sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24";
   };
 
+  ini = writeText "php.ini" ''
+    [PHP]
+    memory_limit = -1 ; no limit as composer uses a lot of memory
+
+    [Phar]
+    phar.readonly = Off
+  '';
+
 in stdenv.mkDerivation rec {
-  name = "wp-cli-${version}";
+  pname = "wp-cli";
   inherit version;
 
   src = fetchurl {
-    url    = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
-    sha256 = "05lbay4c0477465vv4h8d2j94pk3haz1a7f0ncb127fvxz3a2pcg";
+    url    = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar";
+    sha256 = "0s03jbsjwvkcbyss6rvpgw867hiwvk5p4n1qznkghyzi94j8mvki";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
+
   buildCommand = ''
     dir=$out/share/wp-cli
     mkdir -p $out/bin $dir
 
-    cat <<_EOF > $out/bin/wp
-#!${runtimeShell}
-
-set -euo pipefail
-
-exec ${lib.getBin php}/bin/php \\
-  -c $dir/php.ini \\
-  -f $dir/wp-cli -- "\$@"
-_EOF
-    chmod 0755 $out/bin/wp
-
-    cat <<_EOF > $dir/php.ini
-[PHP]
-memory_limit = -1 ; no limit as composer uses a lot of memory
-
-[Phar]
-phar.readonly = Off
-_EOF
+    install -Dm444 ${src}        $dir/wp-cli
+    install -Dm444 ${ini}        $dir/php.ini
+    install -Dm444 ${completion} $out/share/bash-completion/completions/wp
 
-    install -Dm644 ${src}        $dir/wp-cli
-    install -Dm644 ${completion} $out/share/bash-completion/completions/wp
+    makeWrapper ${lib.getBin php}/bin/php $out/bin/wp \
+      --add-flags "-c $dir/php.ini" \
+      --add-flags "-f $dir/wp-cli"
 
     # this is a very basic run test
-    $out/bin/wp --info
+    $out/bin/wp --info >/dev/null
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A command line interface for WordPress";
     homepage    = https://wp-cli.org;
     license     = licenses.mit;