public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some evaluation fixes

Browse Source 
Not all multiple-output fixups were properly tested.
This commit is contained in:
Vladimír Čunát 2015-10-15 18:59:39 +02:00
parent 148e03b2f1
commit 31d9263159
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/blink/default.nix
View File

@ -22,7 +22,7 @@ pythonPackages.buildPythonPackage rec {
postInstall = '' postInstall = ''
wrapProgram $out/bin/blink \ wrapProgram $out/bin/blink \
--prefix LD_LIBRARY_PATH ":" ${gnutls.lib}/lib --prefix LD_LIBRARY_PATH ":" ${gnutls.out}/lib
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/development/compilers/gcc-arm-embedded/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation {
for f in $(find $out); do for f in $(find $out); do
if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \ patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
--set-rpath $out/lib:${gcc.lib}/lib:${ncurses.lib}/lib \ --set-rpath $out/lib:${gcc.lib or gcc}/lib:${ncurses.lib}/lib \
"$f" || true "$f" || true
fi fi
done done

2
pkgs/development/libraries/qt-3/default.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation {
${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""} ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""}
${if xftSupport then "-xft ${if xftSupport then "-xft
-L${libXft.out}/lib -I${libXft.dev}/include -L${libXft.out}/lib -I${libXft.dev}/include
-L${libXft.freetype.lib}/lib -I${libXft.freetype.dev}/include -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include
-L${libXft.fontconfig.lib}/lib -I${libXft.fontconfig.dev}/include" else "-no-xft"} -L${libXft.fontconfig.lib}/lib -I${libXft.fontconfig.dev}/include" else "-no-xft"}
"; ";

4
pkgs/top-level/python-packages.nix
View File

@ -395,7 +395,7 @@ let
postInstall = '' postInstall = ''
wrapProgram $out/bin/alot \ wrapProgram $out/bin/alot \
--prefix LD_LIBRARY_PATH : '${lib.makeLibraryPath [ pkgs.notmuch pkgs.file pkgs.gpgme ]}' --prefix LD_LIBRARY_PATH : '${pkgs.lib.makeLibraryPath [ pkgs.notmuch pkgs.file pkgs.gpgme ]}'
''; '';
meta = { meta = {
@ -14692,7 +14692,7 @@ let
# I don't know why I need to add these libraries. Shouldn't they # I don't know why I need to add these libraries. Shouldn't they
# be part of wxPython? # be part of wxPython?
postInstall = '' postInstall = ''
libspaths=${with pkgs.xorg; lib.makeLibraryPath [ libSM libXScrnSaver ]} libspaths=${with pkgs.xorg; pkgs.lib.makeLibraryPath [ libSM libXScrnSaver ]}
wrapProgram $out/bin/taskcoach.py \ wrapProgram $out/bin/taskcoach.py \
--prefix LD_LIBRARY_PATH : $libspaths --prefix LD_LIBRARY_PATH : $libspaths
''; '';