ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-24 20:02:58 +03:00
Code Issues Projects Releases Wiki Activity

fix references to ${libtool}/lib

Browse Source
This commit is contained in:
Vladimír Čunát 2015-10-06 13:23:53 +02:00
parent b9d2c364a1
commit 1197003966
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/misc/xca/default.nix
View File

@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram "$out/bin/xca" \
--prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.cc}/lib:${gcc.cc}/lib64:${openssl}/lib:${libtool}/lib"
--prefix LD_LIBRARY_PATH : \
"${gcc.cc.lib}/lib64:${stdenv.lib.makeLibraryPath [ qt4 gcc.cc openssl libtool ]}"
'';
buildInputs = [ openssl qt4 libtool gcc makeWrapper ];

4
pkgs/applications/virtualization/bochs/default.nix
View File

@ -143,8 +143,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional busMouse "--enable-busmouse"
;
NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/ -I${libtool}/include/";
NIX_LDFLAGS="-L${libtool}/lib";
NIX_CFLAGS_COMPILE="-I${gtk.dev}/include/gtk-2.0/ -I${libtool}/include/";
NIX_LDFLAGS="-L${libtool.lib}/lib";
meta = with stdenv.lib; {
description = "An open-source IA-32 (x86) PC emulator";

2
pkgs/development/libraries/libcanberra/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
postInstall = ''
for f in $out/lib/*.la; do
sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $f
sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $f
done
'';

2
pkgs/development/libraries/libextractor/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
configureFlags = "--disable-ltdl-install "
+ "--with-ltdl-include=${libtool}/include "
+ "--with-ltdl-lib=${libtool}/lib "
+ "--with-ltdl-lib=${libtool.lib}/lib "
+ "--enable-xpdf";
# Checks need to be run after "make install", otherwise plug-ins are not in

2
pkgs/development/libraries/libopensc-dnie/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
ar x opensc-dnie*
tar xf data.tar.gz
RPATH=${glib}/lib:${opensc}/lib:${openssl}/lib:${openct}/lib:${libtool}/lib:${pcsclite}/lib:${stdenv.cc.libc.out}/lib:${zlib}/lib
RPATH=${stdenv.lib.makeLibraryPath [ glib opensc openssl openct libtool pcsclite stdenv.cc.libc zlib ]}
for a in "usr/lib/"*.so*; do
if ! test -L $a; then

3
pkgs/servers/pulseaudio/default.nix
View File

@ -110,7 +110,8 @@ stdenv.mkDerivation rec {
postInstall = lib.optionalString libOnly ''
rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $out/lib/libpulsecore-${version}.la
sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $out/lib/libpulsecore-${version}.la
_moveToOutput lib/cmake "$dev"
'';
meta = {