treewide: Use makeLibraryPath in LD_LIBRARY_PATHs
This commit is contained in:
parent
51ad423716
commit
d3705faa56
|
@ -20,7 +20,7 @@ in
|
|||
services.xserver.windowManager.session = singleton
|
||||
{ name = "metacity";
|
||||
start = ''
|
||||
env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext.out}/lib:/usr/lib/
|
||||
env LD_LIBRARY_PATH=${lib.makeLibraryPath [ xorg.libX11 xorg.libXext ]}:/usr/lib/
|
||||
# !!! Hack: load the schemas for Metacity.
|
||||
GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
|
||||
--makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
|
||||
|
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
configurePhase = ''
|
||||
findInputs ${boost} boost_dirs propagated-native-build-inputs
|
||||
|
||||
export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include
|
||||
|
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||
mkdir -p Build
|
||||
pushd Build
|
||||
|
||||
export LD_LIBRARY_PATH="${blas}/lib:${nvidia_x11}/lib"
|
||||
export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [ blas nvidia_x11 ]}"
|
||||
|
||||
cmake ../src -DCMAKE_INSTALL_PREFIX=$out \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
|
|
|
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
|
|||
sed -i \
|
||||
-e 's|$(uname -m)|i686|' \
|
||||
-e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \
|
||||
-e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${libXtst}/lib:${glib}/lib:${gtk2}/lib:./x10flasher_lib/linux/lib32|' \
|
||||
-e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \
|
||||
FlashTool FlashToolConsole
|
||||
'';
|
||||
|
||||
|
|
Loading…
Reference in a new issue