diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 03:11:09 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-30 03:11:09 +0300 |
| commit | c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744 (patch) | |
| tree | 31178a48b090778f8a51b2aefbe292df1dbff7ab /pkgs/tools | |
| parent | 01f857409fa30393a90bc82e16c25b79500d43d3 (diff) | |
| download | nixlib-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.tar nixlib-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.tar.gz nixlib-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.tar.bz2 nixlib-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.tar.lz nixlib-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.tar.xz nixlib-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.tar.zst nixlib-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.zip | |
treewide: Use explicit 'dev' references to glibc
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/admin/daemontools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/calamares/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/tgt/default.nix | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix index 08f21dc62622..5594368b04f4 100644 --- a/pkgs/tools/admin/daemontools/default.nix +++ b/pkgs/tools/admin/daemontools/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { configurePhase = '' cd ${name} - sed -ie '1 s_$_ -include ${glibc}/include/errno.h_' src/conf-cc + sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc substituteInPlace src/Makefile \ --replace '/bin/sh' '${bash}/bin/bash -oxtrace' sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests - cat ${glibc}/include/errno.h + cat ${glibc.dev}/include/errno.h ''; buildPhase = '' diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 7c7c0b0a5ec3..9356eb365497 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { -i src/modules/locale/timezonewidget/localeconst.h \ -i src/modules/locale/SetTimezoneJob.cpp - sed -e 's,/usr/share/i18n/locales,${glibc}/share/i18n/locales,' \ + sed -e 's,/usr/share/i18n/locales,${glibc.out}/share/i18n/locales,' \ -i src/modules/locale/timezonewidget/localeconst.h sed -e 's,/usr/share/X11/xkb/rules/base.lst,${xkeyboard_config}/share/X11/xkb/rules/base.lst,' \ diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index bd4be0f1b867..2a6de71a0072 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -22,8 +22,8 @@ in stdenv.mkDerivation rec { 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/|${stdenv.glibc}/include/sys/|' usr/Makefile - sed -i 's|/usr/include/linux/|${stdenv.glibc}/include/linux/|' usr/Makefile + sed -i 's|/usr/include/sys/|${stdenv.glibc.dev}/include/sys/|' usr/Makefile + sed -i 's|/usr/include/linux/|${stdenv.glibc.dev}/include/linux/|' usr/Makefile ''; postInstall = '' |