diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 00:14:00 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-23 00:14:00 +0300 |
| commit | d3705faa560c9831bcc27ffebb1eaaca291c64f0 (patch) | |
| tree | ee11b2bef959a1ae11c5311f67a7b827841d435e | |
| parent | 51ad423716ec959aa6056660202e59a4b400ca4e (diff) | |
| download | nixpkgs-d3705faa560c9831bcc27ffebb1eaaca291c64f0.tar nixpkgs-d3705faa560c9831bcc27ffebb1eaaca291c64f0.tar.gz nixpkgs-d3705faa560c9831bcc27ffebb1eaaca291c64f0.tar.bz2 nixpkgs-d3705faa560c9831bcc27ffebb1eaaca291c64f0.tar.lz nixpkgs-d3705faa560c9831bcc27ffebb1eaaca291c64f0.tar.xz nixpkgs-d3705faa560c9831bcc27ffebb1eaaca291c64f0.tar.zst nixpkgs-d3705faa560c9831bcc27ffebb1eaaca291c64f0.zip | |
treewide: Use makeLibraryPath in LD_LIBRARY_PATHs
| -rw-r--r-- | nixos/modules/services/x11/window-managers/metacity.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/science/math/clblas/cuda/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/mobile/flashtool/default.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index 2957ad91be4..12bc19ad3c2 100644 --- a/nixos/modules/services/x11/window-managers/metacity.nix +++ b/nixos/modules/services/x11/window-managers/metacity.nix @@ -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 # */ diff --git a/pkgs/development/libraries/science/math/clblas/cuda/default.nix b/pkgs/development/libraries/science/math/clblas/cuda/default.nix index 8691009acae..0b5a3323ec1 100644 --- a/pkgs/development/libraries/science/math/clblas/cuda/default.nix +++ b/pkgs/development/libraries/science/math/clblas/cuda/default.nix @@ -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 \ diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 1689b2f506f..06d38c700dd 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -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 ''; |