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

- Modify bootstrap script to reuse composerEnv from package

Browse source 
- Prefix package names with composer-
This commit is contained in:
Sander van der Burg 2017-09-24 22:46:14 +02:00
parent 1dc4359009
commit a457596b5f
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrap.sh
View file

@ -1,5 +1,5 @@
#!/bin/sh -e #!/bin/sh -e
php ~/composer.phar install php ~/composer.phar install
php bin/composer2nix php bin/composer2nix --composer-env src/Composer2Nix/composer-env.nix --no-copy-composer-env
rm -Rf vendor rm -Rf vendor

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

@ -150,6 +150,7 @@ rec {
'') (builtins.attrNames dependencies); '') (builtins.attrNames dependencies);
in in
stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "packages" "devPackages" ] // { stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "packages" "devPackages" ] // {
name = "composer-${args.name}";
buildInputs = [ php composer ] ++ args.buildInputs or []; buildInputs = [ php composer ] ++ args.buildInputs or [];
buildCommand = '' buildCommand = ''
${if executable then '' ${if executable then ''