Merge staging-next into staging

2021-03-02 12:17:32 +00:00
parent f14c5a6d92 c770b491e3
commit e668a36492
18 changed files with 50 additions and 38 deletions
@@ -16,10 +16,10 @@
 }@args:

 stdenv.mkDerivation (args // {
-  name = "php-${pname}-${version}";
+  pname = "php-${php.version}-${pname}";
  extensionName = pname;

-  inherit src;
+  inherit version src;

  nativeBuildInputs = [ autoreconfHook re2c ] ++ nativeBuildInputs;
  buildInputs = [ php ] ++ peclDeps ++ buildInputs;