fixup! version up: nano 2.8.4

5a2736bb · Julien Muchembled · f58b8bc1 · 5a2736bb
Commit 5a2736bb authored May 24, 2017 by Julien Muchembled
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

component/nano/buildout.cfg component/nano/buildout.cfg +5 -2

No files found.
--- a/component/nano/buildout.cfg
+++ b/component/nano/buildout.cfg
@@ -10,10 +10,13 @@ extends =
 recipe = slapos.recipe.cmmi
 url = http://www.nano-editor.org/dist/v2.8/nano-2.8.4.tar.xz
 md5sum = 02ff28870194178595b287fc16fa611b
+# The dummy PKG_CONFIG is in the case that both pkg-config and ncursesw
+# are installed on the system.
 environment=
+  PKG_CONFIG=false
+  NCURSESW_CONFIG=${ncurses:location}/bin/ncursesw6-config
  CPPFLAGS=-I${file:location}/include
-  NCURSESW_CFLAGS=-I${ncurses:location}/include
+  LDFLAGS=-L${file:location}/lib/ -Wl,-rpath=${file:location}/lib/
-  LDFLAGS=-L${file:location}/lib/ -Wl,-rpath=${file:location}/lib/ -L${ncurses:location}/lib/ -Wl,-rpath=${ncurses:location}/lib/
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 post-install =
  cd ${:location} && mkdir etc &&