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/applications | |
| parent | 01f857409fa30393a90bc82e16c25b79500d43d3 (diff) | |
| download | nixpkgs-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.tar nixpkgs-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.tar.gz nixpkgs-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.tar.bz2 nixpkgs-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.tar.lz nixpkgs-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.tar.xz nixpkgs-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.tar.zst nixpkgs-c3bcb4e1ce3facf1d6bd627f91e9d8a08ca0d744.zip | |
treewide: Use explicit 'dev' references to glibc
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/audio/ardour/ardour3.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/science/math/calc/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index bad4a255d3c..d9614d10d32 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -48,7 +48,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 patchShebangs ./tools/ ''; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 8673d7debd9..b9db4174c09 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let makeFlags = '' - INCDIR=${glibc}/include \ + INCDIR=${glibc.dev}/include \ BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \ USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses' \ TERMCONTROL=-DUSE_TERMIOS \ |