From 009b9850779197dba8b7e849d303f93be307536f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 1 Jan 2024 10:16:58 +0000 Subject: [PATCH] aaxtomp3: fix eval for non-glibc targets Without the change the eval fails as: $ nix build --no-link -f. pkgsCross.aarch64-android.aaxtomp3 error: error: cannot coerce null to a string --- pkgs/development/misc/resholve/oildev.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index 2459c492ebc0..92c3828abfc1 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -10,7 +10,7 @@ git , # oil deps file -, glibcLocales +, pkgsBuildBuild , six , typing }: @@ -123,7 +123,7 @@ rec { ''; # See earlier note on glibcLocales TODO: verify needed? - LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${pkgsBuildBuild.glibcLocales}/lib/locale/locale-archive"; # not exhaustive; sample what resholve uses as a sanity check pythonImportsCheck = [