X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=pkgs%2Fstatus_engine%2Fworker.nix;h=1232303103c12daef4f8f5b6c42e75e102971a5d;hb=2053ddac783c931053676ebc2b02bc8b82d89399;hp=6c1444949ca6d69b0f3ca8ba36cdda0ee1a091b3;hpb=69e6151c0c324f920eccb34568ed7ff523592589;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/status_engine/worker.nix b/pkgs/status_engine/worker.nix
index 6c14449..1232303 100644
--- a/pkgs/status_engine/worker.nix
+++ b/pkgs/status_engine/worker.nix
@@ -1,7 +1,6 @@
-{ stdenv, mylibs, composerEnv, fetchurl, gearmand, callPackage, php73, php73base, config_file ? "/var/lib/status_engine/ui.yml" }:
+{ stdenv, mylibs, composerEnv, fetchurl, gearmand, callPackage, php73, config_file ? "/var/lib/status_engine/ui.yml" }:
 let
-  # FIXME: present in php73.buildPecl in latest nixpkgs-unstable
-  gearman = (callPackage <nixpkgs/pkgs/build-support/build-pecl.nix> { php = php73base; }) rec {
+  gearman = php73.buildPecl rec {
     version = "2.0.6";
     pname = "gearman";
     src = fetchurl {
@@ -13,7 +12,7 @@ let
   };
 in
 (composerEnv.override {
-  php = php73.withExtensions(e: php73.enabledExtensions ++ (with php73.extensions; [gearman redis mbstring bcmath json iconv]));
+  php = php73.withExtensions({ enabled, all }: enabled ++ (with all; [gearman redis mbstring bcmath json iconv]));
 }).buildPackage (mylibs.fetchedGithub ./worker.json //
   import ./worker_php_packages.nix { inherit composerEnv fetchurl; } // rec {
     postInstall = ''