treewide: Make explicit that 'dev' output of boehmgc is used

This commit is contained in:
Tuomas Tynkkynen 2016-04-16 19:45:49 +03:00 committed by Vladimír Čunát
parent 3865e739de
commit 825bd69b38
3 changed files with 3 additions and 3 deletions

View File

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
ln -s $out/libexec/w3m/w3mimgdisplay $out/bin
'';
configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"
configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc.dev}"
+ optionalString graphicsSupport " --enable-image=${optionalString x11Support "x11,"}fb";
preConfigure = ''

View File

@ -24,7 +24,7 @@ stdenv.mkDerivation {
./autogen.sh
'';
configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc}";
configureFlags = if stdenv.system == "i686-linux" then "--with-mps=$(TMPDIR)/mps" else "--with-gc=${boehmgc.dev}";
buildPhase = "make 3-stage-bootstrap";
postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin";

View File

@ -40,7 +40,7 @@ stdenv.mkDerivation {
configureFlags="$configureFlags --with-latex=$out/share/texmf/tex/latex --with-context=$out/share/texmf/tex/context/third"
'';
NIX_CFLAGS_COMPILE = [ "-I${boehmgc}/include/gc" ];
NIX_CFLAGS_COMPILE = [ "-I${boehmgc.dev}/include/gc" ];
postInstall = ''
mv -v "$out/share/info/asymptote/"*.info $out/share/info/