diff --git a/all-packages.nix b/all-packages.nix index afe53e928..3ff21d651 100644 --- a/all-packages.nix +++ b/all-packages.nix @@ -1,10 +1,9 @@ { newScope, - php-newScope, ... }: let self = rec { - flarum = php-callPackage ./pkgs/flarum {}; + flarum = callPackage ./pkgs/flarum {}; gnunet-messenger-cli = callPackage ./pkgs/gnunet-messenger-cli {}; kikit = callPackage ./pkgs/kikit {}; liberaforms = callPackage ./pkgs/liberaforms {}; @@ -20,6 +19,5 @@ }; callPackage = newScope (self // nixpkgs-candidates // {inherit callPackage;}); - php-callPackage = php-newScope (self // nixpkgs-candidates // {inherit callPackage;}); in self diff --git a/flake.nix b/flake.nix index 4f900d70d..54cd70e27 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "NgiPkgs"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.php-nixpkgs.url = "github:drupol/nixpkgs?ref=php/add-new-builder"; + inputs.nix-php-composer-builder.url = "github:loophp/nix-php-composer-builder"; inputs.flake-utils.url = "github:numtide/flake-utils"; # Set the defaultSystem list for flake-utils to only x86_64-linux inputs.systems.url = "github:nix-systems/x86_64-linux"; @@ -13,19 +13,21 @@ outputs = { self, nixpkgs, - php-nixpkgs, + nix-php-composer-builder, flake-utils, treefmt-nix, ... }: let buildOutputs = system: let - pkgs = nixpkgs.legacyPackages.${system}; - php-pkgs = php-nixpkgs.legacyPackages.${system}; + pkgs = nixpkgs.legacyPackages.${system} { + overlays = [ + inputs.nix-php-composer-builder.overlays.default + ]; + }; treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix; in { packages = import ./all-packages.nix { inherit (pkgs) newScope; - php-newScope = php-pkgs.newScope; }; nixosModules = { modules = import ./modules/all-modules.nix;