treewide: change some glibc to stdenv.cc.libc

Artturin c1fffdff 0c4d65b2

Changed files
+83 -89
doc
pkgs
applications
audio
baudline
yoshimi
editors
eclipse
jetbrains
vscode
extensions
graphics
sane
backends
brscan4
brscan5
networking
spideroak
science
math
cplex
hmetis
virtualization
virtualbox
build-support
development
compilers
nvidia-cg-toolkit
mobile
androidenv
node-packages
python-modules
monotonic
tools
eclipse-mat
iaca
games
planetaryannihilation
ue4demos
misc
cups
drivers
brgenml1lpr
canon
hl1110
hl3140cw
mfcj470dwlpr
os-specific
linux
mwprocapture
sgx
tools
compression
kzipmix
graphics
pngout
inputmethods
m17n-db
misc
nbench
networking
package-management
checkinstall
system
hardinfo
+1 -1
doc/stdenv/multiple-output.chapter.md
···
A commonly adopted convention in `nixpkgs` is that executables provided by the package are contained within its first output. This convention allows the dependent packages to reference the executables provided by packages in a uniform manner. For instance, provided with the knowledge that the `perl` package contains a `perl` executable it can be referenced as `${pkgs.perl}/bin/perl` within a Nix derivation that needs to execute a Perl script.
-
The `glibc` package is a deliberate single exception to the “binaries first” convention. The `glibc` has `libs` as its first output allowing the libraries provided by `glibc` to be referenced directly (e.g. `${glibc}/lib/ld-linux-x86-64.so.2`). The executables provided by `glibc` can be accessed via its `bin` attribute (e.g. `${glibc.bin}/bin/ldd`).
+
The `glibc` package is a deliberate single exception to the “binaries first” convention. The `glibc` has `libs` as its first output allowing the libraries provided by `glibc` to be referenced directly (e.g. `${glibc}/lib/ld-linux-x86-64.so.2`). The executables provided by `glibc` can be accessed via its `bin` attribute (e.g. `${lib.getBin stdenv.cc.libc}/bin/ldd`).
The reason for why `glibc` deviates from the convention is because referencing a library provided by `glibc` is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of `glibc` libraries from Nix packages (please see the documentation on [patchelf](https://github.com/NixOS/patchelf) for more details).
+2 -2
pkgs/applications/audio/baudline/default.nix
···
{ lib, stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, libjack2
-
, makeWrapper, glibc
+
, makeWrapper
}:
let
···
cp -r . "$out/libexec/baudline/"
-
interpreter="$(echo ${glibc.out}/lib/ld-linux*)"
+
interpreter="$(echo ${stdenv.cc.libc}/lib/ld-linux*)"
for prog in "$out"/libexec/baudline/baudline*; do
patchelf --interpreter "$interpreter" "$prog"
ln -sr "$prog" "$out/bin/"
+1 -2
pkgs/applications/audio/yoshimi/default.nix
···
{ lib
-
, glibc
, stdenv
, fetchFromGitHub
, alsa-lib
···
zlib
];
-
cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${glibc.out}/lib/libm.so" ];
+
cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.cc.libc}/lib/libm.so" ];
meta = with lib; {
description = "High quality software synthesizer based on ZynAddSubFX";
+2 -2
pkgs/applications/editors/eclipse/build-eclipse.nix
···
-
{ lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, glibc
+
{ lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender
, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk
, makeWrapper, perl, ... }:
···
tar xfvz $src -C $out
# Patch binaries.
-
interpreter=$(echo ${glibc.out}/lib/ld-linux*.so.2)
+
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
libCairo=$out/eclipse/libcairo-swt.so
patchelf --set-interpreter $interpreter $out/eclipse/eclipse
[ -f $libCairo ] && patchelf --set-rpath ${lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo
+2 -2
pkgs/applications/editors/jetbrains/linux.nix
···
-
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText, glibc
+
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText
, coreutils, gnugrep, which, git, unzip, libsecret, libnotify, e2fsprogs
, vmopts ? null
}:
···
truncate --size=$size $fname
}
-
interpreter=$(echo ${glibc.out}/lib/ld-linux*.so.2)
+
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
if [[ "${stdenv.hostPlatform.system}" == "x86_64-linux" && -e bin/fsnotifier64 ]]; then
target_size=$(get_file_size bin/fsnotifier64)
patchelf --set-interpreter "$interpreter" bin/fsnotifier64
+1 -1
pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh
···
echo "$(nix-build -E "$nixExp" --no-out-link)${suffix}"
}
-
interpreter="$(get_pkg_out "glibc" "/lib/ld-linux-x86-64.so.2")"
+
interpreter="$(get_pkg_out "stdenv.cc.libc" "/lib/ld-linux-x86-64.so.2")"
echo "interpreter='$interpreter'"
# For clangformat dep on 'libtinfo.so.5'.
+2 -2
pkgs/applications/graphics/sane/backends/brscan4/default.nix
···
-
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb-compat-0_1, glibc }:
+
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb-compat-0_1 }:
let
myPatchElf = file: with lib; ''
patchelf --set-interpreter \
-
${glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
+
${stdenv.cc.libc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
${file}
'';
+2 -2
pkgs/applications/graphics/sane/backends/brscan5/default.nix
···
-
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests, glibc }:
+
{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }:
let
myPatchElf = file: with lib; ''
patchelf --set-interpreter \
-
${glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
+
${stdenv.cc.libc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
${file}
'';
system = stdenv.hostPlatform.system;
+2 -2
pkgs/applications/networking/spideroak/default.nix
···
-
{ lib, stdenv, fetchurl, makeWrapper, patchelf, glibc
+
{ lib, stdenv, fetchurl, makeWrapper, patchelf
, fontconfig, freetype, glib, libICE, libSM
, libX11, libXext, libXrender, zlib
}:
···
rm -f $out/opt/SpiderOakONE/lib/libz*
-
patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 \
+
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \
"$out/opt/SpiderOakONE/lib/SpiderOakONE"
RPATH=$out/opt/SpiderOakONE/lib:${ldpath}
+2 -2
pkgs/applications/science/math/cplex/default.nix
···
-
{ lib, stdenv, makeWrapper, openjdk, gtk2, xorg, glibc, glibcLocales, releasePath ? null }:
+
{ lib, stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath ? null }:
# To use this package, you need to download your own cplex installer from IBM
# and override the releasePath attribute to point to the location of the file.
···
let
libraryPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 xorg.libXtst ];
in ''
-
interpreter=${glibc}/lib/ld-linux-x86-64.so.2
+
interpreter=${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2
for pgm in $out/opl/bin/x86-64_linux/oplrun $out/opl/bin/x86-64_linux/oplrunjava $out/opl/oplide/oplide;
do
+3 -3
pkgs/applications/science/math/hmetis/default.nix
···
-
{ lib, stdenv, fetchurl, ghostscript, glibc }:
+
{ lib, stdenv, fetchurl, ghostscript }:
stdenv.mkDerivation rec {
pname = "hmetis";
···
patchPhase = ''
for binaryfile in $binaryFiles; do
patchelf \
-
--set-interpreter ${glibc}/lib/ld-linux.so.2 \
-
--set-rpath ${glibc}/lib \
+
--set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 \
+
--set-rpath ${stdenv.cc.libc}/lib \
$binaryfile
done
'';
+3 -3
pkgs/applications/virtualization/virtualbox/default.nix
···
{ config, stdenv, fetchurl, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook
-
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL, glibc
+
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib
···
${optionalString (!headless) ''
-e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \
''} -i configure
-
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2
-
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2
+
ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2
+
ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2
grep 'libpulse\.so\.0' src include -rI --files-with-match | xargs sed -i -e '
${optionalString pulseSupport
+4 -4
pkgs/build-support/vm/default.nix
···
mkdir -p $out/lib
# Copy what we need from Glibc.
-
cp -p ${pkgs.glibc.out}/lib/ld-linux*.so.? $out/lib
-
cp -p ${pkgs.glibc.out}/lib/libc.so.* $out/lib
-
cp -p ${pkgs.glibc.out}/lib/libm.so.* $out/lib
-
cp -p ${pkgs.glibc.out}/lib/libresolv.so.* $out/lib
+
cp -p ${pkgs.stdenv.cc.libc}/lib/ld-linux*.so.? $out/lib
+
cp -p ${pkgs.stdenv.cc.libc}/lib/libc.so.* $out/lib
+
cp -p ${pkgs.stdenv.cc.libc}/lib/libm.so.* $out/lib
+
cp -p ${pkgs.stdenv.cc.libc}/lib/libresolv.so.* $out/lib
# Copy BusyBox.
cp -pd ${pkgs.busybox}/bin/* $out/bin
+2 -2
pkgs/development/compilers/nvidia-cg-toolkit/default.nix
···
-
{ lib, stdenv, fetchurl, glibc }:
+
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "3.1";
···
installPhase = ''
for b in cgc cgfxcat cginfo
do
-
patchelf --set-interpreter ${glibc.out}/lib/ld-linux*.so.? "bin/$b"
+
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux*.so.? "bin/$b"
done
# FIXME: cgfxcat and cginfo need more patchelf
mkdir -p "$out/bin/"
+1 -1
pkgs/development/mobile/androidenv/cmake.nix
···
deployAndroidPackage {
inherit package os;
nativeBuildInputs = [ autoPatchelfHook ];
-
buildInputs = lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 ];
+
buildInputs = lib.optional (os == "linux") [ pkgs.stdenv.cc.libc pkgs.stdenv.cc.cc pkgs.ncurses5 ];
patchInstructions = lib.optionalString (os == "linux") ''
autoPatchelf $packageBaseDir/bin
'';
+1 -1
pkgs/development/node-packages/overrides.nix
···
wrapProgram "$out/bin/makam" --prefix PATH : ${lib.makeBinPath [ nodejs ]}
${
if stdenv.isLinux
-
then "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""
+
then "patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""
else ""
}
'';
+1 -2
pkgs/development/python-modules/monotonic/default.nix
···
{ lib, stdenv
, buildPythonPackage
, fetchPypi
-
, glibc
}:
buildPythonPackage rec {
···
patchPhase = lib.optionalString stdenv.isLinux ''
substituteInPlace monotonic.py --replace \
-
"ctypes.util.find_library('c')" "'${glibc.out}/lib/libc.so.6'"
+
"ctypes.util.find_library('c')" "'${stdenv.cc.libc}/lib/libc.so'"
'';
meta = with lib; {
+1 -2
pkgs/development/tools/eclipse-mat/default.nix
···
{ fetchurl
-
, glibc
, fontconfig
, freetype
, glib
···
mv mat $out
# Patch binaries.
-
interpreter=$(echo ${glibc.out}/lib/ld-linux*.so.2)
+
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
libCairo=$out/eclipse/libcairo-swt.so
patchelf --set-interpreter $interpreter $out/mat/MemoryAnalyzer
[ -f $libCairo ] && patchelf --set-rpath ${
+2 -2
pkgs/development/tools/iaca/2.1.nix
···
-
{ lib, stdenv, makeWrapper, requireFile, gcc, unzip, glibc }:
+
{ lib, stdenv, makeWrapper, requireFile, gcc, unzip }:
with lib;
# v2.1: last version with NHM/WSM arch support
···
'';
preFixup = let libPath = makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in ''
patchelf \
-
--set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 \
+
--set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \
--set-rpath $out/lib:"${libPath}" \
$out/bin/iaca
'';
+2 -2
pkgs/development/tools/iaca/3.0.nix
···
-
{ lib, stdenv, requireFile, unzip, glibc }:
+
{ lib, stdenv, requireFile, unzip }:
with lib;
stdenv.mkDerivation rec {
···
installPhase = ''
mkdir -p $out/bin
cp iaca $out/bin
-
patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/iaca
+
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $out/bin/iaca
'';
meta = {
description = "Intel Architecture Code Analyzer";
+4 -4
pkgs/games/planetaryannihilation/default.nix
···
-
{ lib, stdenv, glibc, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk
+
{ lib, stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsa-lib, atk
, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg, requireFile }:
stdenv.mkDerivation rec {
···
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 "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${glibc.out}/lib64" "$out/host/CoherentUI_Host"
+
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.cc.libc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsa-lib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" "$out/host/CoherentUI_Host"
-
wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${glibc.out}/lib64"
+
wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.cc.libc xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64"
for f in $out/lib/*; do
-
patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 glibc.out xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${glibc.out}/lib64" $f
+
patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.cc.libc xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" $f
done
'';
+2 -2
pkgs/games/ue4demos/default.nix
···
-
{ lib, stdenv, fetchurl, unzip, patchelf, xorg, openal, glibc }:
+
{ lib, stdenv, fetchurl, unzip, patchelf, xorg, openal }:
let
urls = file:
···
cd $out
unzip $src
-
interpreter=$(echo ${glibc.out}/lib/ld-linux*.so.2)
+
interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2)
binary=$(find . -executable -type f)
patchelf \
--set-interpreter $interpreter \
+3 -3
pkgs/misc/cups/drivers/brgenml1lpr/default.nix
···
-
{ lib, stdenv, fetchurl, cups, perl, glibc, ghostscript, which, makeWrapper}:
+
{ lib, stdenv, fetchurl, cups, perl, ghostscript, which, makeWrapper}:
/*
[Setup instructions](http://support.brother.com/g/s/id/linux/en/instruction_prn1a.html).
···
let
myPatchElf = file: with lib; ''
patchelf --set-interpreter \
-
${glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
+
${stdenv.cc.libc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
${file}
'';
in
···
'';
nativeBuildInputs = [ makeWrapper ];
-
buildInputs = [ cups perl glibc ghostscript which ];
+
buildInputs = [ cups perl stdenv.cc.libc ghostscript which ];
dontBuild = true;
+10 -11
pkgs/misc/cups/drivers/canon/default.nix
···
, ghostscript
, pkgs
, pkgsi686Linux
-
, glibc
, zlib
}:
···
ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so
ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so.1
-
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.glibc.out}/lib:${pkgsi686Linux.libxml2.out}/lib:$out/lib32" libcanonufr2r.so.1.0.0
-
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.glibc.out}/lib" libcaepcmufr2.so.1.0
-
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.glibc.out}/lib" libColorGearCufr2.so.2.0.0
+
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.stdenv.cc.libc}/lib:${pkgsi686Linux.libxml2.out}/lib:$out/lib32" libcanonufr2r.so.1.0.0
+
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.stdenv.cc.libc}/lib" libcaepcmufr2.so.1.0
+
patchelf --set-rpath "$(cat ${i686_NIX_GCC}/nix-support/orig-cc)/lib:${libs pkgsi686Linux}:${pkgsi686Linux.stdenv.cc.libc}/lib" libColorGearCufr2.so.2.0.0
)
(
···
ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so
ln -sf libufr2filterr.so.1.0.0 libufr2filterr.so.1
-
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${glibc.out}/lib64:$out/lib" libcanonufr2r.so.1.0.0
-
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${glibc.out}/lib64" libcaepcmufr2.so.1.0
-
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${glibc.out}/lib64" libColorGearCufr2.so.2.0.0
+
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0
+
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0
+
patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" libColorGearCufr2.so.2.0.0
)
(
cd $out/bin
-
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${glibc.out}/lib64" cnsetuputil2
-
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${glibc.out}/lib64" cnpdfdrv
-
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${glibc.out}/lib64:$out/lib" cnpkbidir
-
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${glibc.out}/lib64:$out/lib" cnrsdrvufr2
+
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2
+
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64" cnpdfdrv
+
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir
+
patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${stdenv.cc.cc.lib}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnrsdrvufr2
mv cnsetuputil2 cnsetuputil2.wrapped
echo "#!${runtimeShell} -e" > cnsetuputil2
+4 -4
pkgs/misc/cups/drivers/hl1110/default.nix
···
-
{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, glibc }:
+
{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk }:
let
version = "3.0.1-1";
···
sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/HL1110/lpd/psconvert2
-
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/brprintconflsr3
-
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/rawtobr3
-
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/inf/braddprinter
+
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/brprintconflsr3
+
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/lpd/rawtobr3
+
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/opt/brother/Printers/HL1110/inf/braddprinter
wrapProgram $out/opt/brother/Printers/HL1110/lpd/psconvert2 \
--prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] }
+3 -3
pkgs/misc/cups/drivers/hl3140cw/default.nix
···
-
{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk, glibc}:
+
{lib, stdenv, fetchurl, cups, dpkg, gnused, makeWrapper, ghostscript, file, a2ps, coreutils, gawk }:
let
version = "1.1.4-0";
···
sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/hl3140cw/lpd/psconvertij2
-
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/hl3140cw/lpd/brhl3140cwfilter
-
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_hl3140cw
+
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/opt/brother/Printers/hl3140cw/lpd/brhl3140cwfilter
+
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_hl3140cw
wrapProgram $out/opt/brother/Printers/hl3140cw/lpd/psconvertij2 \
--prefix PATH ":" ${ lib.makeBinPath [ gnused coreutils gawk ] }
+2 -2
pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix
···
-
{ lib, stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper, glibc }:
+
{ lib, stdenv, fetchurl, cups, dpkg, ghostscript, a2ps, coreutils, gnused, gawk, file, makeWrapper }:
stdenv.mkDerivation rec {
pname = "mfcj470dw-cupswrapper";
···
sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/mfcj470dw/lpd/psconvertij2
-
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter
+
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter
mkdir -p $out/lib/cups/filter/
ln -s $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw $out/lib/cups/filter/brother_lpdwrapper_mfcj470dw
+2 -2
pkgs/os-specific/linux/mwprocapture/default.nix
···
-
{ lib, stdenv, fetchurl, kernel, alsa-lib, glibc }:
+
{ lib, stdenv, fetchurl, kernel, alsa-lib }:
with lib;
···
if stdenv.is64bit then "64"
else "32";
-
libpath = makeLibraryPath [ stdenv.cc.cc glibc alsa-lib ];
+
libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc alsa-lib ];
in
stdenv.mkDerivation rec {
+1 -2
pkgs/os-specific/linux/sgx/ssl/default.nix
···
{ stdenv
-
, glibc
, fetchFromGitHub
, fetchpatch
, fetchurl
···
nativeBuildInputs = [
perl
sgx-sdk
-
glibc
+
stdenv.cc.libc
which
];
+3 -3
pkgs/tools/compression/kzipmix/default.nix
···
-
{ lib, stdenv, fetchurl, glibc }:
+
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "kzipmix";
···
mkdir -p $out/bin
cp amd64/{kzip,zipmix} $out/bin
-
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 $out/bin/kzip
-
patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix
+
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/bin/kzip
+
patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 $out/bin/zipmix
'';
meta = with lib; {
+1 -2
pkgs/tools/graphics/pngout/default.nix
···
, stdenv
, fetchurl
, unzip
-
, glibc
}:
let
···
mkdir -p $out/bin
cp ${platform.folder}/pngout $out/bin
'' + lib.optionalString stdenv.isLinux ''
-
patchelf --set-interpreter ${glibc.out}/lib/${platform.ld-linux} $out/bin/pngout
+
patchelf --set-interpreter ${stdenv.cc.libc}/lib/${platform.ld-linux} $out/bin/pngout
'';
meta = {
+2 -2
pkgs/tools/inputmethods/m17n-db/default.nix
···
-
{ lib, stdenv, fetchurl, gettext, gawk, bash, glibc }:
+
{ lib, stdenv, fetchurl, gettext, gawk, bash }:
stdenv.mkDerivation rec {
pname = "m17n-db";
···
strictDeps = true;
-
configureFlags = [ "--with-charmaps=${glibc.out}/share/i18n/charmaps" ]
+
configureFlags = [ "--with-charmaps=${stdenv.cc.libc}/share/i18n/charmaps" ]
;
meta = {
+2 -2
pkgs/tools/misc/nbench/default.nix
···
-
{ lib, stdenv, fetchurl, glibc }:
+
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
pname = "nbench-byte";
···
'';
buildInputs = lib.optionals stdenv.hostPlatform.isGnu [
-
glibc.static
+
stdenv.cc.libc.static
];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
+3 -3
pkgs/tools/networking/tgt/default.nix
···
-
{ stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl, glibc
+
{ stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl
, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, util-linux
}:
···
preConfigure = ''
sed -i 's|/usr/bin/||' doc/Makefile
sed -i 's|/usr/include/libaio.h|${libaio}/include/libaio.h|' usr/Makefile
-
sed -i 's|/usr/include/sys/|${glibc.dev}/include/sys/|' usr/Makefile
-
sed -i 's|/usr/include/linux/|${glibc.dev}/include/linux/|' usr/Makefile
+
sed -i 's|/usr/include/sys/|${stdenv.cc.libc.dev}/include/sys/|' usr/Makefile
+
sed -i 's|/usr/include/linux/|${stdenv.cc.libc.dev}/include/linux/|' usr/Makefile
'';
postInstall = ''
+2 -2
pkgs/tools/package-management/checkinstall/default.nix
···
-
{lib, stdenv, fetchurl, gettext, glibc }:
+
{lib, stdenv, fetchurl, gettext }:
stdenv.mkDerivation rec {
pname = "checkinstall";
···
substituteInPlace checkinstallrc-dist --replace /usr/local $out
substituteInPlace installwatch/create-localdecls \
-
--replace /usr/include/unistd.h ${glibc.dev}/include/unistd.h
+
--replace /usr/include/unistd.h ${stdenv.cc.libc.dev}/include/unistd.h
'';
postInstall =
+2 -2
pkgs/tools/system/hardinfo/default.nix
···
-
{ lib, stdenv, fetchurl, which, pkg-config, gtk2, pcre, glib, libxml2, glibc
+
{ lib, stdenv, fetchurl, which, pkg-config, gtk2, pcre, glib, libxml2
, libsoup ? null
}:
···
sed -i -e "s/^CFLAGS = \(.*\)/CFLAGS = \1 -std=gnu89/" Makefile.in
substituteInPlace ./arch/linux/common/modules.h --replace /sbin/modinfo modinfo
-
substituteInPlace ./arch/linux/common/os.h --replace /lib/libc.so.6 ${glibc.out}/lib/libc.so.6
+
substituteInPlace ./arch/linux/common/os.h --replace /lib/libc.so.6 ${stdenv.cc.libc}/lib/libc.so
'';
# Makefile supports DESTDIR but not PREFIX (it hardcodes $DESTDIR/usr/).