From afa88c8aa7fe524403f17a4b1c571d50d3313ddd Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 24 Mar 2019 10:49:23 +0100
Subject: [PATCH 1/2] phpPackages.composer: 1.8.0 -> 1.8.4

Changelogs:
https://github.com/composer/composer/releases/tag/1.8.1
https://github.com/composer/composer/releases/tag/1.8.2
https://github.com/composer/composer/releases/tag/1.8.3
https://github.com/composer/composer/releases/tag/1.8.4
---
 pkgs/top-level/php-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 165064414048..bf79adc01795 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -253,17 +253,17 @@ let
   };
 
   composer = pkgs.stdenv.mkDerivation rec {
-    name = "composer-${version}";
-    version = "1.8.0";
+    pname = "composer";
+    version = "1.8.4";
 
     src = pkgs.fetchurl {
       url = "https://getcomposer.org/download/${version}/composer.phar";
-      sha256 = "19pg9ip2mpyf5cyq34fld7qwl77mshqw3c4nif7sxmpnar6sh089";
+      sha256 = "12h5vqwhklxvwrplggzjl21n6kb972pwkj9ivmn2vbxyixn848hp";
     };
 
     unpackPhase = ":";
 
-    buildInputs = [ pkgs.makeWrapper ];
+    nativeBuildInputs = [ pkgs.makeWrapper ];
 
     installPhase = ''
       mkdir -p $out/bin

From 52fa2d4be128fa000b6b37e80c0f69e8818e5543 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 24 Mar 2019 11:16:06 +0100
Subject: [PATCH 2/2] phpPackages.composer: Add unzip to path

Unzip is used by composer to install dependencies etc. If it's not
there it defaults to using PHP's built in zip functions. But they are
slower and composer complains to the user if this happens.
---
 pkgs/top-level/php-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index bf79adc01795..ba4ce18f04df 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -269,7 +269,8 @@ let
       mkdir -p $out/bin
       install -D $src $out/libexec/composer/composer.phar
       makeWrapper ${php}/bin/php $out/bin/composer \
-        --add-flags "$out/libexec/composer/composer.phar"
+        --add-flags "$out/libexec/composer/composer.phar" \
+        --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]}
     '';
 
     meta = with pkgs.lib; {