fix "libc}/lib" and similar references
Done mostly without any verification. I didn't bother with libc}/include, as the path is still correct.
This commit is contained in:
Vladimír Čunát
parent
b7c3c25218
commit
3b9ef2c71b
@ -28,7 +28,7 @@ with lib;
|
||||
capability setuid,
|
||||
network inet raw,
|
||||
|
||||
${pkgs.glibc}/lib/*.so mr,
|
||||
${pkgs.glibc.out}/lib/*.so mr,
|
||||
${pkgs.libcap}/lib/libcap.so* mr,
|
||||
${pkgs.attr}/lib/libattr.so* mr,
|
||||
|
||||
|
||||
@ -104,7 +104,7 @@ in
|
||||
/dev/null rw,
|
||||
/dev/urandom r,
|
||||
|
||||
${pkgs.glibc}/lib/*.so mr,
|
||||
${pkgs.glibc.out}/lib/*.so mr,
|
||||
${pkgs.tzdata}/share/zoneinfo/** r,
|
||||
|
||||
${dnscrypt-proxy}/share/dnscrypt-proxy/** r,
|
||||
|
||||
@ -61,14 +61,14 @@ in
|
||||
restartTriggers = [ config.environment.etc.hosts.source config.environment.etc."nsswitch.conf".source ];
|
||||
|
||||
serviceConfig =
|
||||
{ ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${cfgFile}";
|
||||
{ ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd -f ${cfgFile}";
|
||||
Type = "forking";
|
||||
PIDFile = "/run/nscd/nscd.pid";
|
||||
Restart = "always";
|
||||
ExecReload =
|
||||
[ "${pkgs.glibc}/sbin/nscd --invalidate passwd"
|
||||
"${pkgs.glibc}/sbin/nscd --invalidate group"
|
||||
"${pkgs.glibc}/sbin/nscd --invalidate hosts"
|
||||
[ "${pkgs.glibc.bin}/sbin/nscd --invalidate passwd"
|
||||
"${pkgs.glibc.bin}/sbin/nscd --invalidate group"
|
||||
"${pkgs.glibc.bin}/sbin/nscd --invalidate hosts"
|
||||
];
|
||||
};
|
||||
|
||||
@ -76,7 +76,7 @@ in
|
||||
# its pid. So wait until it's ready.
|
||||
postStart =
|
||||
''
|
||||
while ! ${pkgs.glibc}/sbin/nscd -g -f ${cfgFile} > /dev/null; do
|
||||
while ! ${pkgs.glibc.bin}/sbin/nscd -g -f ${cfgFile} > /dev/null; do
|
||||
sleep 0.2
|
||||
done
|
||||
'';
|
||||
|
||||
@ -113,7 +113,7 @@ in
|
||||
#include <abstractions/base>
|
||||
#include <abstractions/nameservice>
|
||||
|
||||
${pkgs.glibc}/lib/*.so mr,
|
||||
${pkgs.glibc.out}/lib/*.so mr,
|
||||
${pkgs.libevent}/lib/libevent*.so* mr,
|
||||
${pkgs.curl}/lib/libcurl*.so* mr,
|
||||
${pkgs.openssl}/lib/libssl*.so* mr,
|
||||
|
||||
@ -32,7 +32,7 @@ let
|
||||
# This wrapper ensures that we actually get themes
|
||||
makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
|
||||
$out/greeter \
|
||||
--prefix PATH : "${pkgs.glibc}/bin" \
|
||||
--prefix PATH : "${pkgs.glibc.bin}/bin" \
|
||||
--set GDK_PIXBUF_MODULE_FILE "$(find ${theme} -name loaders.cache)" \
|
||||
--set GTK_PATH "${theme}:${pkgs.gtk3}" \
|
||||
--set GTK_EXE_PREFIX "${theme}" \
|
||||
|
||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patchPhase = ''
|
||||
printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
|
||||
sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
|
||||
sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
|
||||
sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
|
||||
sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
|
||||
'';
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
buildPhase = ''
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
--set-rpath "$out/opt/google/musicmanager:${readline}/lib:${ncurses}/lib:${stdenv.cc.libc}/lib:${qt48}/lib:${stdenv.cc.cc}/lib:${libidn}/lib:${expat}/lib:${flac}/lib:${libvorbis}/lib" opt/google/musicmanager/MusicManager
|
||||
--set-rpath "$out/opt/google/musicmanager:${readline}/lib:${ncurses}/lib:${stdenv.cc.libc.out}/lib:${qt48}/lib:${stdenv.cc.cc}/lib:${libidn}/lib:${expat}/lib:${flac}/lib:${libvorbis}/lib" opt/google/musicmanager/MusicManager
|
||||
'';
|
||||
|
||||
dontPatchELF = true;
|
||||
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = "cd src";
|
||||
|
||||
cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so" ];
|
||||
cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "high quality software synthesizer based on ZynAddSubFX";
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
enableParallelBuilding = true;
|
||||
patches = [ ./writable-projects.patch ];
|
||||
preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
|
||||
postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig";
|
||||
postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig";
|
||||
configureFlags = [ "--enable-pch=no" ]
|
||||
++ optional contribPlugins "--with-contrib-plugins";
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ let
|
||||
tar xfvz $src -C $out
|
||||
|
||||
# Patch binaries.
|
||||
interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
|
||||
interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
|
||||
libCairo=$out/eclipse/libcairo-swt.so
|
||||
patchelf --set-interpreter $interpreter $out/eclipse/eclipse
|
||||
[ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo
|
||||
|
||||
@ -41,7 +41,7 @@ let
|
||||
truncate --size=$size $fname
|
||||
}
|
||||
|
||||
interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
|
||||
interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
|
||||
if [ "${stdenv.system}" == "x86_64-linux" ]; then
|
||||
target_size=$(get_file_size bin/fsnotifier64)
|
||||
patchelf --set-interpreter "$interpreter" bin/fsnotifier64
|
||||
|
||||
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include"
|
||||
"-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so"
|
||||
"-DPTHREAD_INCLUDE_DIR=${stdenv.glibc.dev}/include"
|
||||
"-DPTHREAD_LIBRARY=${stdenv.glibc.out}/lib/libpthread.so"
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
"-DBINARY_PACKAGE_BUILD=1"
|
||||
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
|
||||
|
||||
@ -13,8 +13,8 @@ stdenv.mkDerivation {
|
||||
patches = [ ./cstdio.patch ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DM_LIBRARY=${stdenv.glibc}/lib/libm.so"
|
||||
"-DDL_LIBRARY=${stdenv.glibc}/lib/libdl.so"
|
||||
"-DM_LIBRARY=${stdenv.glibc.out}/lib/libm.so"
|
||||
"-DDL_LIBRARY=${stdenv.glibc.out}/lib/libdl.so"
|
||||
"-DBUILD_UTILS=1"
|
||||
"-DBUILD_SEG3D=1"
|
||||
"-DBUILD_DATAFLOW=0"
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"
|
||||
substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc.bin}/bin/catchsegv"
|
||||
'';
|
||||
|
||||
postConfigure = ''
|
||||
|
||||
@ -34,7 +34,7 @@ in stdenv.mkDerivation {
|
||||
ln -s "$out/${appdir}/CopyConsole" "$out/bin/copy_console"
|
||||
ln -s "$out/${appdir}/CopyAgent" "$out/bin/copy_agent"
|
||||
ln -s "$out/${appdir}/CopyCmd" "$out/bin/copy_cmd"
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \
|
||||
"$out/${appdir}/CopyConsole"
|
||||
|
||||
RPATH=${gcc.cc}/lib:$out/${appdir}
|
||||
|
||||
@ -96,7 +96,7 @@ in stdenv.mkDerivation {
|
||||
rm -fr "$out/${appdir}/plugins"
|
||||
|
||||
find "$out/${appdir}" -type f -a -perm +0100 \
|
||||
-print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \;
|
||||
-print -exec patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} {} \;
|
||||
|
||||
RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir}
|
||||
echo "updating rpaths to: $RPATH"
|
||||
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
make install
|
||||
for file in "$out"/bin/* "$out"/sbin/*; do
|
||||
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.cc}/lib:${stdenv.glibc}/lib::${gcc.cc}/lib64:${stdenv.glibc}/lib64:${libedit}/lib:${qt4}/lib"
|
||||
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib"
|
||||
done
|
||||
'';
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@ in stdenv.mkDerivation {
|
||||
ensureDir "$out/bin"
|
||||
rm "$out/usr/bin/SpiderOak"
|
||||
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \
|
||||
"$out/opt/SpiderOak/lib/SpiderOak"
|
||||
|
||||
RPATH=$out/opt/SpiderOak/lib:${ldpath}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xproto, gccmakedep }:
|
||||
|
||||
let
|
||||
libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include";
|
||||
libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib";
|
||||
libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc.dev}/include";
|
||||
libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc.out}/lib";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tkgate-1.8.7";
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchurl, tcl, tk, libX11, glibc }:
|
||||
|
||||
let
|
||||
libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include";
|
||||
libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib";
|
||||
libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc.dev}/include";
|
||||
libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc.out}/lib";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tkgate-2.0-b10";
|
||||
|
||||
@ -65,7 +65,7 @@ rec {
|
||||
'' ["defEnsureDir" "minInit"];
|
||||
|
||||
patchBinaries = a.fullDepEntry ''
|
||||
patchelf --set-interpreter "${pkgsi686Linux.glibc}"/lib/ld-linux.so.* \
|
||||
patchelf --set-interpreter "${pkgsi686Linux.glibc.out}"/lib/ld-linux.so.* \
|
||||
"Scripts/tptp4X"
|
||||
'' ["addInputs"];
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
lame faad2 libvorbis yasm libvpx xvidcore libva
|
||||
] ++ stdenv.lib.optional faacSupport faac;
|
||||
|
||||
cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" +
|
||||
cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc.dev}/include" +
|
||||
" -DGETTEXT_INCLUDE_DIR=${gettext}/include" +
|
||||
" -DSDL_INCLUDE_DIR=${SDL}/include/SDL";
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
for lib in $libs; do
|
||||
echo -n "$lib " >> macros/libslist
|
||||
done
|
||||
echo -n "${stdenv.glibc}/lib" >> macros/libslist
|
||||
echo -n "${stdenv.glibc.out}/lib" >> macros/libslist
|
||||
|
||||
# Make sure to honor $TMPDIR, for chroot builds.
|
||||
for file in configure gui/Makefile.in Makefile.in
|
||||
|
||||
@ -78,8 +78,8 @@ in stdenv.mkDerivation {
|
||||
-e 's@MKISOFS --version@MKISOFS -version@' \
|
||||
-e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
|
||||
-i configure
|
||||
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2
|
||||
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2
|
||||
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2
|
||||
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2
|
||||
find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} +
|
||||
sed -e 's@"libasound.so.2"@"${alsaLib}/lib/libasound.so.2"@g' -i src/VBox/Main/xml/Settings.cpp src/VBox/Devices/Audio/alsa_stubs.c
|
||||
export USER=nix
|
||||
|
||||
@ -63,10 +63,10 @@ stdenv.mkDerivation {
|
||||
for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} lib/VBoxGuestAdditions/mount.vboxsf
|
||||
do
|
||||
${if stdenv.system == "i686-linux" then ''
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $i
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $i
|
||||
''
|
||||
else if stdenv.system == "x86_64-linux" then ''
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $i
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 $i
|
||||
''
|
||||
else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
|
||||
}
|
||||
|
||||
@ -31,9 +31,9 @@ rec {
|
||||
mkdir -p $out/lib
|
||||
|
||||
# Copy what we need from Glibc.
|
||||
cp -p ${pkgs.stdenv.glibc}/lib/ld-linux*.so.? $out/lib
|
||||
cp -p ${pkgs.stdenv.glibc}/lib/libc.so.* $out/lib
|
||||
cp -p ${pkgs.stdenv.glibc}/lib/libm.so.* $out/lib
|
||||
cp -p ${pkgs.stdenv.glibc.out}/lib/ld-linux*.so.? $out/lib
|
||||
cp -p ${pkgs.stdenv.glibc.out}/lib/libc.so.* $out/lib
|
||||
cp -p ${pkgs.stdenv.glibc.out}/lib/libm.so.* $out/lib
|
||||
|
||||
# Copy BusyBox.
|
||||
cp -pd ${pkgs.busybox}/bin/* $out/bin
|
||||
@ -561,7 +561,7 @@ rec {
|
||||
buildCommand = ''
|
||||
${createRootFS}
|
||||
|
||||
PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc}/bin:${lzma}/bin
|
||||
PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma}/bin
|
||||
|
||||
# Unpack the .debs. We do this to prevent pre-install scripts
|
||||
# (which have lots of circular dependencies) from barfing.
|
||||
|
||||
@ -30,7 +30,7 @@ stdenv.mkDerivation {
|
||||
|
||||
for f in $(find $out); do
|
||||
if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
|
||||
patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \
|
||||
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
|
||||
--set-rpath $out/lib:${gcc}/lib:${ncurses}/lib \
|
||||
"$f" || true
|
||||
fi
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
, removeGodocExternals ? false }:
|
||||
|
||||
let
|
||||
loader386 = "${glibc}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc}/lib/ld-linux.so.3";
|
||||
loader386 = "${glibc.out}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc.out}/lib/ld-linux.so.3";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
|
||||
|
||||
let
|
||||
loader386 = "${glibc}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc}/lib/ld-linux.so.3";
|
||||
loader386 = "${glibc.out}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc.out}/lib/ld-linux.so.3";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ stdenv, lib, fetchurl, fetchhg, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }:
|
||||
|
||||
let
|
||||
loader386 = "${glibc}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc}/lib/ld-linux.so.3";
|
||||
loader386 = "${glibc.out}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc.out}/lib/ld-linux.so.3";
|
||||
srcs = {
|
||||
golang = fetchurl {
|
||||
url = https://storage.googleapis.com/golang/go1.3.3.src.tar.gz;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ stdenv, lib, fetchurl, fetchgit, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security }:
|
||||
|
||||
let
|
||||
loader386 = "${glibc}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc}/lib/ld-linux.so.3";
|
||||
loader386 = "${glibc.out}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc.out}/lib/ld-linux.so.3";
|
||||
srcs = {
|
||||
golang = fetchurl {
|
||||
url = https://github.com/golang/go/archive/go1.4.2.tar.gz;
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}:
|
||||
|
||||
let
|
||||
loader386 = "${glibc}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc}/lib/ld-linux.so.3";
|
||||
loader386 = "${glibc.out}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc.out}/lib/ld-linux.so.3";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patchShebangs . contrib
|
||||
|
||||
export PATH="$PATH:${stdenv.cc.libc}/sbin"
|
||||
export PATH="$PATH:${stdenv.cc.libc.bin}/bin"
|
||||
|
||||
# ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
|
||||
# is probably not what we want anyway on non-NixOS
|
||||
|
||||
@ -6,8 +6,8 @@ let
|
||||
usr_prefix = if stdenv.isDarwin then "usr/local" else "usr";
|
||||
|
||||
dynamic_linker =
|
||||
if stdenv.isx86_64 then "${stdenv.glibc}/lib/ld-linux-x86-64.so.2"
|
||||
else "${stdenv.glibc}/lib/ld-linux.so.2";
|
||||
if stdenv.isx86_64 then "${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2"
|
||||
else "${stdenv.glibc.out}/lib/ld-linux.so.2";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
for b in cgc cgfxcat cginfo
|
||||
do
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux*.so.? "bin/$b"
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux*.so.? "bin/$b"
|
||||
done
|
||||
# FIXME: cgfxcat and cginfo need more patchelf
|
||||
mkdir -p "$out/bin/"
|
||||
|
||||
@ -20,7 +20,7 @@ runCommand "openjdk-bootstrap" {} ''
|
||||
mv openjdk-bootstrap $out
|
||||
|
||||
for i in $out/bin/*; do
|
||||
patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $i
|
||||
patchelf --set-interpreter ${glibc.out}/lib/ld-linux*.so.2 $i
|
||||
done
|
||||
|
||||
# Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings:
|
||||
|
||||
@ -13,7 +13,7 @@ stdenv.mkDerivation {
|
||||
|
||||
patchPhase = ''
|
||||
sed -i s,/usr/bin/ld,$(type -P ld), src/driver/phases.c
|
||||
sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in
|
||||
sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in
|
||||
'';
|
||||
|
||||
cmakeFlags = ''
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
||||
-DPATH64_ENABLE_PSCRUNTIME=OFF
|
||||
-DPATH64_ENABLE_PROFILING=OFF -DPATH64_ENABLE_TARGETS=x8664
|
||||
-DCMAKE_BUILD_TYPE=Debug -DPATH64_ENABLE_FORTRAN=OFF
|
||||
-DPSC_CRT_PATH=${stdenv.cc.libc}/lib
|
||||
-DPSC_CRT_PATH=${stdenv.cc.libc.out}/lib
|
||||
'';
|
||||
|
||||
makeFlags = "-j4";
|
||||
|
||||
@ -108,7 +108,7 @@ stdenv.mkDerivation {
|
||||
mkdir -p "$out"
|
||||
cp -r bin "$out/bin"
|
||||
'' + (if stdenv.isLinux then ''
|
||||
patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
|
||||
patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
|
||||
--set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \
|
||||
"$out/bin/rustc"
|
||||
'' else "");
|
||||
|
||||
@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = ''
|
||||
configureFlagsArray+=("--elfinterp=$(cat $NIX_CC/nix-support/dynamic-linker)")
|
||||
configureFlagsArray+=("--crtprefix=${stdenv.glibc}/lib")
|
||||
configureFlagsArray+=("--sysincludepaths=${stdenv.glibc}/include:{B}/include")
|
||||
configureFlagsArray+=("--libpaths=${stdenv.glibc}/lib")
|
||||
configureFlagsArray+=("--crtprefix=${stdenv.glibc.out}/lib")
|
||||
configureFlagsArray+=("--sysincludepaths=${stdenv.glibc.dev}/include:{B}/include")
|
||||
configureFlagsArray+=("--libpaths=${stdenv.glibc.out}/lib")
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
'' + stdenv.lib.optionalString (stdenv.cc.libc != null)
|
||||
''
|
||||
substituteInPlace Makefile \
|
||||
--replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig
|
||||
--replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig
|
||||
'';
|
||||
|
||||
configurePhase = false;
|
||||
|
||||
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
||||
"-Dinstallstyle=lib/perl5"
|
||||
"-Duseshrplib"
|
||||
"-Dlocincpth=${libc}/include"
|
||||
"-Dloclibpth=${libc}/lib"
|
||||
"-Dloclibpth=${libc.out}/lib"
|
||||
]
|
||||
++ lib.optional enableThreading "-Dusethreads";
|
||||
|
||||
|
||||
@ -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}/lib:${zlib}/lib
|
||||
RPATH=${glib}/lib:${opensc}/lib:${openssl}/lib:${openct}/lib:${libtool}/lib:${pcsclite}/lib:${stdenv.cc.libc.out}/lib:${zlib}/lib
|
||||
|
||||
for a in "usr/lib/"*.so*; do
|
||||
if ! test -L $a; then
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ patchelf ];
|
||||
|
||||
installPhase = ''
|
||||
RPATH=${libusb}/lib:${stdenv.cc.libc}/lib
|
||||
RPATH=${libusb}/lib:${stdenv.cc.libc.out}/lib
|
||||
|
||||
for a in proprietary/*/Contents/Linux/*.so*; do
|
||||
if ! test -L $a; then
|
||||
|
||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx";
|
||||
};
|
||||
|
||||
prePatch = "substituteInPlace Makefile --replace /usr/include/ ${glibc}/include/";
|
||||
prePatch = "substituteInPlace Makefile --replace /usr/include/ ${glibc.dev}/include/";
|
||||
|
||||
patches = [ ./va_args.patch ]; # fixes bogus warnings that failed libsemanage
|
||||
|
||||
|
||||
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
find $out \( \
|
||||
\( -type f -a -name "*.so*" \) -o \
|
||||
\( -type f -a -perm /0100 \) \
|
||||
\) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \
|
||||
\) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
|
||||
--set-rpath ${zlib}/lib:${ncurses}/lib {} \;
|
||||
# fix ineffective PROGDIR / MYNDKDIR determination
|
||||
for i in ndk-build ndk-gdb ndk-gdb-py
|
||||
|
||||
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
find $out \( \
|
||||
\( -type f -a -name "*.so*" \) -o \
|
||||
\( -type f -a -perm /0100 \) \
|
||||
\) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \
|
||||
\) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
|
||||
--set-rpath ${zlib}/lib:${ncurses}/lib {} \;
|
||||
# fix ineffective PROGDIR / MYNDKDIR determination
|
||||
for i in ndk-build ndk-gdb ndk-gdb-py
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
for i in emulator emulator-arm emulator-mips emulator-x86 mksdcard
|
||||
do
|
||||
patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
|
||||
patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
|
||||
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i
|
||||
done
|
||||
|
||||
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
for i in emulator64-arm emulator64-mips emulator64-x86
|
||||
do
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $i
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
|
||||
patchelf --set-rpath ${stdenv.cc.cc}/lib64 $i
|
||||
done
|
||||
''}
|
||||
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
|
||||
# The monitor requires some more patching
|
||||
|
||||
cd lib/monitor-x86
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 monitor
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 monitor
|
||||
patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
|
||||
|
||||
wrapProgram `pwd`/monitor \
|
||||
@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
|
||||
# The monitor requires some more patching
|
||||
|
||||
cd lib/monitor-x86_64
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 monitor
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 monitor
|
||||
patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
|
||||
|
||||
wrapProgram `pwd`/monitor \
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||
# Patch the interpreter
|
||||
for i in aapt aidl dexdump llvm-rs-cc
|
||||
do
|
||||
patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
|
||||
patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
|
||||
done
|
||||
|
||||
# These binaries need to find libstdc++ and libgcc_s
|
||||
@ -43,7 +43,7 @@ stdenv.mkDerivation {
|
||||
# These binaries also need zlib in addition to libstdc++
|
||||
for i in zipalign
|
||||
do
|
||||
patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
|
||||
patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
|
||||
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit}/lib $i
|
||||
done
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation {
|
||||
''
|
||||
for i in adb fastboot
|
||||
do
|
||||
patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
|
||||
patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
|
||||
patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i
|
||||
done
|
||||
''}
|
||||
|
||||
@ -45,11 +45,11 @@ stdenv.mkDerivation {
|
||||
|
||||
${if stdenv.system == "i686-linux" then
|
||||
''
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 titanium_prep.linux32
|
||||
''
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
''
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
|
||||
''
|
||||
else ""}
|
||||
|
||||
|
||||
@ -44,11 +44,11 @@ stdenv.mkDerivation {
|
||||
|
||||
${if stdenv.system == "i686-linux" then
|
||||
''
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 titanium_prep.linux32
|
||||
''
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
''
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
|
||||
''
|
||||
else ""}
|
||||
|
||||
|
||||
@ -44,11 +44,11 @@ stdenv.mkDerivation {
|
||||
|
||||
${if stdenv.system == "i686-linux" then
|
||||
''
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 titanium_prep.linux32
|
||||
''
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
''
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
|
||||
''
|
||||
else ""}
|
||||
|
||||
|
||||
@ -44,11 +44,11 @@ stdenv.mkDerivation {
|
||||
|
||||
${if stdenv.system == "i686-linux" then
|
||||
''
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 titanium_prep.linux32
|
||||
''
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
''
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
|
||||
''
|
||||
else ""}
|
||||
|
||||
|
||||
@ -44,11 +44,11 @@ stdenv.mkDerivation {
|
||||
|
||||
${if stdenv.system == "i686-linux" then
|
||||
''
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 titanium_prep.linux32
|
||||
''
|
||||
else if stdenv.system == "x86_64-linux" then
|
||||
''
|
||||
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
|
||||
patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
|
||||
''
|
||||
else ""}
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ stdenv.mkDerivation {
|
||||
"$out/lib/rustlib/rust-installer-version" \
|
||||
"$out/lib/rustlib/uninstall.sh"
|
||||
'' + (if stdenv.isLinux then ''
|
||||
patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
|
||||
patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
|
||||
--set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \
|
||||
"$out/bin/cargo"
|
||||
'' else "");
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mv chromedriver $out/bin
|
||||
patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
|
||||
patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
|
||||
wrapProgram "$out/bin/chromedriver" \
|
||||
--prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH"
|
||||
'';
|
||||
|
||||
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cp $permission $out/share/df_linux/nix_permission
|
||||
|
||||
patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress
|
||||
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress
|
||||
|
||||
# Store new hash for dwarf-therapist
|
||||
echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.patched
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
# TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional
|
||||
|
||||
# Necessary to find libdl.
|
||||
CMAKE_LIBRARY_PATH = "${stdenv.cc.libc}/lib";
|
||||
CMAKE_LIBRARY_PATH = "${stdenv.cc.libc.out}/lib";
|
||||
|
||||
# Can't have -werror because of the Vorbis header files.
|
||||
cmakeFlags = "-DDISABLE_WERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON";
|
||||
|
||||
@ -34,12 +34,12 @@ stdenv.mkDerivation {
|
||||
ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
|
||||
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host"
|
||||
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host"
|
||||
|
||||
wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64"
|
||||
wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc.out}/lib64"
|
||||
|
||||
for f in $out/lib/*; do
|
||||
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f
|
||||
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc.out}/lib64" $f
|
||||
done
|
||||
'';
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation {
|
||||
mkdir -pv $out/res
|
||||
cp -r * $out/res
|
||||
|
||||
patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \
|
||||
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
|
||||
--set-rpath ${stdenv.cc.cc}/lib:${libX11}/lib:${mesa}/lib \
|
||||
"$out/res/Tibia"
|
||||
|
||||
@ -41,7 +41,7 @@ stdenv.mkDerivation {
|
||||
cat << EOF > "$out/bin/Tibia"
|
||||
#!${stdenv.shell}
|
||||
cd $out/res
|
||||
${glibc}/lib/ld-linux.so.2 --library-path \$LD_LIBRARY_PATH ./Tibia "\$@"
|
||||
${glibc.out}/lib/ld-linux.so.2 --library-path \$LD_LIBRARY_PATH ./Tibia "\$@"
|
||||
EOF
|
||||
|
||||
chmod +x $out/bin/Tibia
|
||||
|
||||
@ -20,7 +20,7 @@ let
|
||||
cd $out
|
||||
unzip $src
|
||||
|
||||
interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
|
||||
interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
|
||||
binary=$(find . -executable -type f)
|
||||
patchelf \
|
||||
--set-interpreter $interpreter \
|
||||
|
||||
@ -44,7 +44,7 @@ stdenv.mkDerivation {
|
||||
# wrappers add the glibc include as "-idirafter", the only way
|
||||
# we can make the glibc take priority is to -include errno.h.
|
||||
postPatch = if stdenv ? glibc && stdenv.glibc != null then ''
|
||||
sed -i 's,$(HOSTCPPFLAGS),-include ${stdenv.glibc}/include/errno.h $(HOSTCPPFLAGS),' config.mk
|
||||
sed -i 's,$(HOSTCPPFLAGS),-include ${stdenv.glibc.dev}/include/errno.h $(HOSTCPPFLAGS),' config.mk
|
||||
'' else "";
|
||||
|
||||
patches = [ ./sheevaplug-sdio.patch ./sheevaplug-config.patch ];
|
||||
|
||||
@ -23,7 +23,7 @@ let
|
||||
prePatchCommon = ''
|
||||
substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man"
|
||||
substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html"
|
||||
substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h"
|
||||
substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc.dev}/include/linux/capability.h"
|
||||
substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man"
|
||||
'';
|
||||
|
||||
@ -47,8 +47,8 @@ let
|
||||
];
|
||||
|
||||
prePatch = prePatchCommon + ''
|
||||
substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h"
|
||||
substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h"
|
||||
substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc.dev}/include/netinet/in.h"
|
||||
substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc.dev}/include/netinet/in.h"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
@ -103,7 +103,7 @@ let
|
||||
prePatch = prePatchCommon + ''
|
||||
substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison"
|
||||
substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex"
|
||||
substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h"
|
||||
substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc.dev}/include/linux/capability.h"
|
||||
## techdoc.pdf still doesn't build ...
|
||||
substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages"
|
||||
'';
|
||||
|
||||
@ -17,17 +17,17 @@ stdenv.mkDerivation rec {
|
||||
LocaleGettext pam TermReadKey RpcXML swig makeWrapper python ];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace libraries/libapparmor/src/Makefile.in --replace "/usr/include" "${glibc}/include"
|
||||
substituteInPlace libraries/libapparmor/src/Makefile.am --replace "/usr/include" "${glibc}/include"
|
||||
substituteInPlace libraries/libapparmor/src/Makefile.in --replace "/usr/include" "${glibc.dev}/include"
|
||||
substituteInPlace libraries/libapparmor/src/Makefile.am --replace "/usr/include" "${glibc.dev}/include"
|
||||
substituteInPlace common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man"
|
||||
substituteInPlace common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html"
|
||||
substituteInPlace common/Make.rules --replace "cpp -dM" "cpp -dM -I${glibc}/include"
|
||||
substituteInPlace common/Make.rules --replace "cpp -dM" "cpp -dM -I${glibc.dev}/include"
|
||||
|
||||
substituteInPlace parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison"
|
||||
substituteInPlace parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex"
|
||||
substituteInPlace parser/Makefile --replace "/usr/include/bits/socket.h" "${glibc}/include/bits/socket.h"
|
||||
substituteInPlace parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h"
|
||||
#substituteInPlace parser/utils/vim/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h"
|
||||
substituteInPlace parser/Makefile --replace "/usr/include/bits/socket.h" "${glibc.dev}/include/bits/socket.h"
|
||||
substituteInPlace parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc.dev}/include/linux/capability.h"
|
||||
#substituteInPlace parser/utils/vim/Makefile --replace "/usr/include/linux/capability.h" "${glibc.dev}/include/linux/capability.h"
|
||||
|
||||
# for some reason pdf documentation doesn't build
|
||||
substituteInPlace parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages"
|
||||
|
||||
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
make oldconfig
|
||||
'' + lib.optionalString useUclibc ''
|
||||
makeFlagsArray+=("CC=gcc -isystem ${uclibc}/include -B${uclibc}/lib -L${uclibc}/lib")
|
||||
makeFlagsArray+=("CC=gcc -isystem ${uclibc}/include -B${uclibc.out}/lib -L${uclibc.out}/lib")
|
||||
'';
|
||||
|
||||
crossAttrs = {
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
cp checksec.sh $out/bin/checksec
|
||||
chmod +x $out/bin/checksec
|
||||
substituteInPlace $out/bin/checksec --replace /bin/bash ${stdenv.shell}
|
||||
substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc}/lib/libc.so.6
|
||||
substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc.out}/lib/libc.so.6
|
||||
substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find
|
||||
substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $"
|
||||
substituteInPlace $out/bin/checksec --replace "xargs file" "xargs ${file}/bin/file"
|
||||
|
||||
@ -8,10 +8,10 @@ stdenv.mkDerivation {
|
||||
name = "${klibc.name}";
|
||||
buildCommand = ''
|
||||
mkdir -p $out/lib
|
||||
cp -prd ${klibc}/lib/klibc/bin $out/
|
||||
cp -p ${klibc}/lib/*.so $out/lib/
|
||||
cp -prd ${klibc.out}/lib/klibc/bin $out/
|
||||
cp -p ${klibc.out}/lib/*.so $out/lib/
|
||||
chmod +w $out/*
|
||||
old=$(echo ${klibc}/lib/klibc-*.so)
|
||||
old=$(echo ${klibc.out}/lib/klibc-*.so)
|
||||
new=$(echo $out/lib/klibc-*.so)
|
||||
for i in $out/bin/*; do
|
||||
echo $i
|
||||
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
"--with-statedir=/var/lib/nfs"
|
||||
"--with-tirpcinclude=${libtirpc}/include/tirpc"
|
||||
]
|
||||
++ stdenv.lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc}/bin/rpcgen";
|
||||
++ stdenv.lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen";
|
||||
|
||||
patchPhase =
|
||||
''
|
||||
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preBuild = assert glibc != null;
|
||||
''
|
||||
substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd
|
||||
substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
preConfigure =
|
||||
''
|
||||
substituteInPlace extras/keymap/Makefile.in \
|
||||
--replace /usr/include ${stdenv.glibc}/include
|
||||
--replace /usr/include ${stdenv.glibc.dev}/include
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
|
||||
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
|
||||
export PATH="$PATH:${stdenv.cc.libc}/sbin"
|
||||
export PATH="$PATH:${stdenv.cc.libc.bin}/bin"
|
||||
patchShebangs .
|
||||
'';
|
||||
|
||||
|
||||
@ -28,7 +28,7 @@ stdenv.mkDerivation {
|
||||
for i in `grep -l -R '/usr/\(include\|src\)' .`; do
|
||||
echo "Patch /usr/include and /usr/src in $i"
|
||||
substituteInPlace $i \
|
||||
--replace "/usr/include" "${glibc}/include" \
|
||||
--replace "/usr/include" "${glibc.dev}/include" \
|
||||
--replace "/usr/src" "$TMP"
|
||||
done
|
||||
|
||||
|
||||
@ -130,20 +130,20 @@ rec {
|
||||
mkdir -p $out/bin $out/lib $out/libexec
|
||||
|
||||
# Copy what we need of Glibc.
|
||||
cp -d ${glibc}/lib/ld-*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libc*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libc_nonshared.a $out/lib
|
||||
cp -d ${glibc}/lib/libm*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libdl*.so* $out/lib
|
||||
cp -d ${glibc}/lib/librt*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libpthread*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libnsl*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libutil*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libnss*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libresolv*.so* $out/lib
|
||||
cp -d ${glibc}/lib/crt?.o $out/lib
|
||||
cp -d ${glibc.out}/lib/ld-*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libc*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libc_nonshared.a $out/lib
|
||||
cp -d ${glibc.out}/lib/libm*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libdl*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/librt*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libpthread*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libnsl*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libutil*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libnss*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libresolv*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/crt?.o $out/lib
|
||||
|
||||
cp -rL ${glibc}/include $out
|
||||
cp -rL ${glibc.dev}/include $out
|
||||
chmod -R u+w $out/include
|
||||
|
||||
# Hopefully we won't need these.
|
||||
|
||||
@ -43,20 +43,20 @@ rec {
|
||||
mkdir -p $out/bin $out/lib $out/libexec
|
||||
|
||||
# Copy what we need of Glibc.
|
||||
cp -d ${glibc}/lib/ld*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libc*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libc_nonshared.a $out/lib
|
||||
cp -d ${glibc}/lib/libm*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libdl*.so* $out/lib
|
||||
cp -d ${glibc}/lib/librt*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libpthread*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libnsl*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libutil*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libnss*.so* $out/lib
|
||||
cp -d ${glibc}/lib/libresolv*.so* $out/lib
|
||||
cp -d ${glibc}/lib/crt?.o $out/lib
|
||||
cp -d ${glibc.out}/lib/ld*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libc*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libc_nonshared.a $out/lib
|
||||
cp -d ${glibc.out}/lib/libm*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libdl*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/librt*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libpthread*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libnsl*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libutil*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libnss*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/libresolv*.so* $out/lib
|
||||
cp -d ${glibc.out}/lib/crt?.o $out/lib
|
||||
|
||||
cp -rL ${glibc}/include $out
|
||||
cp -rL ${glibc.dev}/include $out
|
||||
chmod -R u+w $out/include
|
||||
|
||||
# Hopefully we won't need these.
|
||||
|
||||
@ -12,8 +12,8 @@ stdenv.mkDerivation {
|
||||
mkdir -p $out/bin
|
||||
cp kzip zipmix $out/bin
|
||||
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/bin/kzip
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/bin/zipmix
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -25,7 +25,7 @@ rec {
|
||||
mkdir -p $PWD/builddir
|
||||
cd builddir
|
||||
export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib"
|
||||
cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib
|
||||
cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc.out}/lib
|
||||
'') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
|
||||
|
||||
needLib64 = a.stdenv.system == "x86_64-linux";
|
||||
|
||||
@ -18,9 +18,9 @@ stdenv.mkDerivation {
|
||||
cp ${folder}/pngout $out/bin
|
||||
|
||||
${if stdenv.system == "i686-linux" then ''
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/bin/pngout
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/pngout
|
||||
'' else if stdenv.system == "x86_64-linux" then ''
|
||||
patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/bin/pngout
|
||||
patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/pngout
|
||||
'' else ""}
|
||||
'';
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ python2Packages.buildPythonPackage rec {
|
||||
src = ./nix-paths.patch;
|
||||
df = "${coreutils}/bin/df";
|
||||
python = "${python2}/bin/${python2.executable}";
|
||||
libc = "${stdenv.cc.libc}/lib/libc.so.6";
|
||||
libc = "${stdenv.cc.libc.out}/lib/libc.so.6";
|
||||
})
|
||||
|
||||
# Apply https://github.com/JaviMerino/trash-cli/commit/4f45a37a3
|
||||
|
||||
@ -51,7 +51,7 @@ stdenv.mkDerivation {
|
||||
substituteInPlace checkinstallrc-dist --replace /usr/local $out
|
||||
|
||||
substituteInPlace installwatch/create-localdecls \
|
||||
--replace /usr/include/unistd.h ${stdenv.glibc}/include/unistd.h
|
||||
--replace /usr/include/unistd.h ${stdenv.glibc.dev}/include/unistd.h
|
||||
'';
|
||||
|
||||
postInstall =
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# This package requires a locale ru_RU.cp1251 locale entry.
|
||||
# Waiting for a better idea, I created it modifying a store file using:
|
||||
# localedef -f CP1251 -i ru_RU ru_RU.CP1251
|
||||
# The store file mentioned is in "${glibc}/lib/locale/locale-archive"
|
||||
# The store file mentioned is in "${glibc.out}/lib/locale/locale-archive"
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "multitran-data-0.3";
|
||||
|
||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
cp -a usr/* "$out/"
|
||||
interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*)"
|
||||
interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)"
|
||||
patchelf --set-interpreter "$interpreter" "$out/bin/xidel"
|
||||
patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.glibc]}" "$out/bin/xidel"
|
||||
'';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user