public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opa: Use makeBinPath

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-08-23 03:29:23 +03:00
parent f6640842fe
commit dcbd607682
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/opa/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
# Paths so the opa compiler code generation will use the same programs as were # Paths so the opa compiler code generation will use the same programs as were
# used to build opa. # used to build opa.
codeGeneratorPaths = "${ocamlPackages.ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin:${nodejs}/bin"; codeGeneratorPaths = stdenv.lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ];
preConfigure = '' preConfigure = ''
patchShebangs . patchShebangs .

9
pkgs/development/tools/misc/distcc/masq.nix
View File

@ -3,10 +3,6 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "distcc-masq-${gccRaw.name}"; name = "distcc-masq-${gccRaw.name}";
meta = {
platforms = stdenv.lib.platforms.linux;
};
phases = [ "installPhase" ]; phases = [ "installPhase" ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
@ -40,6 +36,9 @@ stdenv.mkDerivation {
ln -sf $bbin/*-as $out/bin/as ln -sf $bbin/*-as $out/bin/as
done done
fi fi
''; '';
meta = {
platforms = stdenv.lib.platforms.linux;
};
} }