diff options
Diffstat (limited to 'pkgs/applications')
12 files changed, 23 insertions, 27 deletions
diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index 7d6d51011cc2e..ab88642e6bc21 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, libjack2 -, makeWrapper +, makeWrapper, glibc }: let @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cp -r . "$out/libexec/baudline/" - interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)" + interpreter="$(echo ${glibc.out}/lib/ld-linux*)" for prog in "$out"/libexec/baudline/baudline*; do patchelf --interpreter "$interpreter" "$prog" ln -sr "$prog" "$out/bin/" diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index fe9da33e5cae7..e6fbada15d285 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,4 +1,5 @@ { lib +, glibc , stdenv , fetchFromGitHub , alsa-lib @@ -20,8 +21,6 @@ , zlib }: -assert stdenv ? glibc; - stdenv.mkDerivation rec { pname = "yoshimi"; version = "2.1.2.2"; @@ -60,7 +59,7 @@ stdenv.mkDerivation rec { zlib ]; - cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so" ]; + cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${glibc.out}/lib/libm.so" ]; meta = with lib; { description = "High quality software synthesizer based on ZynAddSubFX"; diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 3b497f34a439a..c9bb8168995f3 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender +{ lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, glibc , zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk , makeWrapper, perl, ... }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { tar xfvz $src -C $out # Patch binaries. - interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) + interpreter=$(echo ${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 ${lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index ea763ecb39ad8..b91d12401917f 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -6,8 +6,6 @@ , callPackage }: -assert stdenv ? glibc; - # https://download.eclipse.org/eclipse/downloads/ is the main place to # find the downloads needed for new versions # diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix index 55ed0e6829e5a..9cc94a6484c92 100644 --- a/pkgs/applications/editors/jetbrains/linux.nix +++ b/pkgs/applications/editors/jetbrains/linux.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText +{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText, glibc , coreutils, gnugrep, which, git, unzip, libsecret, libnotify, e2fsprogs , vmopts ? null }: @@ -46,7 +46,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { truncate --size=$size $fname } - interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) + interpreter=$(echo ${glibc.out}/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 diff --git a/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh b/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh index f5eb08d78a5dc..7f1f08ca0f3bb 100755 --- a/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh +++ b/pkgs/applications/editors/vscode/extensions/cpptools/missing_elf_deps.sh @@ -11,7 +11,7 @@ function get_pkg_out() { echo "$(nix-build -E "$nixExp" --no-out-link)${suffix}" } -interpreter="$(get_pkg_out "stdenv.glibc" "/lib/ld-linux-x86-64.so.2")" +interpreter="$(get_pkg_out "glibc" "/lib/ld-linux-x86-64.so.2")" echo "interpreter='$interpreter'" # For clangformat dep on 'libtinfo.so.5'. @@ -49,4 +49,3 @@ function print_nix_version_mono() { echo "nixMonoBin='$nixMonoBin'" $nixMonoBin/mono --version } - diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 93d40374607e4..b203f0c3dbc63 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb-compat-0_1 }: +{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb-compat-0_1, glibc }: let myPatchElf = file: with lib; '' patchelf --set-interpreter \ - ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ ${file} ''; diff --git a/pkgs/applications/graphics/sane/backends/brscan5/default.nix b/pkgs/applications/graphics/sane/backends/brscan5/default.nix index 219d435a81a0d..4afc5ac40a269 100644 --- a/pkgs/applications/graphics/sane/backends/brscan5/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan5/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests }: +{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, libusb1, avahi-compat, glib, libredirect, nixosTests, glibc }: let myPatchElf = file: with lib; '' patchelf --set-interpreter \ - ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ + ${glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ ${file} ''; system = stdenv.hostPlatform.system; diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index edff4c78126ed..3543a979fb343 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, patchelf +{ lib, stdenv, fetchurl, makeWrapper, patchelf, glibc , fontconfig, freetype, glib, libICE, libSM , libX11, libXext, libXrender, zlib }: @@ -37,7 +37,7 @@ in stdenv.mkDerivation { rm -f $out/opt/SpiderOakONE/lib/libz* - patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 \ + patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 \ "$out/opt/SpiderOakONE/lib/SpiderOakONE" RPATH=$out/opt/SpiderOakONE/lib:${ldpath} diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix index 068f9f0ea3c14..f3caa037b35e5 100644 --- a/pkgs/applications/science/math/cplex/default.nix +++ b/pkgs/applications/science/math/cplex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath ? null }: +{ lib, stdenv, makeWrapper, openjdk, gtk2, xorg, glibc, 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. @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { let libraryPath = lib.makeLibraryPath [ stdenv.cc.cc gtk2 xorg.libXtst ]; in '' - interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 + interpreter=${glibc}/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 diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix index f25a0f13c7fb0..e97b81daeddad 100644 --- a/pkgs/applications/science/math/hmetis/default.nix +++ b/pkgs/applications/science/math/hmetis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ghostscript }: +{ lib, stdenv, fetchurl, ghostscript, glibc }: stdenv.mkDerivation rec { pname = "hmetis"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { patchPhase = '' for binaryfile in $binaryFiles; do patchelf \ - --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 \ - --set-rpath ${stdenv.glibc}/lib \ + --set-interpreter ${glibc}/lib/ld-linux.so.2 \ + --set-rpath ${glibc}/lib \ $binaryfile done ''; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 9424628d28779..2cc0e30f2b981 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,5 +1,5 @@ { config, stdenv, fetchurl, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook -, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL +, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL, glibc , 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 @@ -62,8 +62,8 @@ in stdenv.mkDerivation { ${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 ${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 + 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 grep 'libpulse\.so\.0' src include -rI --files-with-match | xargs sed -i -e ' ${optionalString pulseSupport |