diff options
| author | Artturi <Artturin@artturin.com> | 2022-05-27 17:56:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-27 17:56:19 +0300 |
| commit | 60a08714866da907bc9e63e49a157c8d20893520 (patch) | |
| tree | af23a9167b0d33fe314b871943e4bf76ddda2c77 /pkgs/applications/audio | |
| parent | eb41f632ff07d5f1ae0416cb768afbeca41ca54c (diff) | |
| parent | c1fffdfffb43b07ce09b14da0af9a856e1e8566e (diff) | |
Merge pull request #172391 from Artturin/deprecate-stdenv-glibc
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/baudline/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/audio/yoshimi/default.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index 7d6d51011cc2e..b2a74e23dc5ea 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cp -r . "$out/libexec/baudline/" - interpreter="$(echo ${stdenv.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/" diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index fe9da33e5cae7..1f47a456c9497 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -20,8 +20,6 @@ , zlib }: -assert stdenv ? glibc; - stdenv.mkDerivation rec { pname = "yoshimi"; version = "2.1.2.2"; @@ -60,7 +58,7 @@ stdenv.mkDerivation rec { zlib ]; - cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.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"; |