darkkirb/composer2nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make all composer-env functions entirely overridable, not mkDerivation

Browse source
This commit is contained in:
Sander van der Burg 2018-06-25 23:00:08 +02:00
parent f0aa6db6b6
commit cce1630d5b
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Composer2Nix/composer-env.nix
View file

@ -2,7 +2,7 @@
{ stdenv, writeTextFile, fetchurl, php, unzip }: { stdenv, writeTextFile, fetchurl, php, unzip }:
rec { let
composer = stdenv.mkDerivation { composer = stdenv.mkDerivation {
name = "composer-1.6.5"; name = "composer-1.6.5";
src = fetchurl { src = fetchurl {
@ -166,7 +166,7 @@ rec {
extraArgs = removeAttrs args [ "name" "packages" "devPackages" "buildInputs" ]; extraArgs = removeAttrs args [ "name" "packages" "devPackages" "buildInputs" ];
in in
stdenv.lib.makeOverridable stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "composer-${name}"; name = "composer-${name}";
buildInputs = [ php composer ] ++ buildInputs; buildInputs = [ php composer ] ++ buildInputs;
@ -262,4 +262,9 @@ rec {
runHook postInstall runHook postInstall
''; '';
} // extraArgs); } // extraArgs);
in
{
composer = stdenv.lib.makeOverridable composer;
buildZipPackage = stdenv.lib.makeOverridable buildZipPackage;
buildPackage = stdenv.lib.makeOverridable buildPackage;
} }