diff options
| author | Yureka <yuka@yuka.dev> | 2022-11-27 13:44:47 +0100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-11-27 18:17:26 +0000 |
| commit | d66c3f242f49a6b9cb2d2527fda0faff67bc083a (patch) | |
| tree | 06f8e54e54feae1e26aa09516ab956c6216fb34e | |
| parent | Merge pull request #203176 from NixOS/backport-201382-to-release-22.11 (diff) | |
| download | nixpkgs-origin/backport-203248-to-release-22.11.tar.gz | |
pkgsMusl.gjs: fix buildorigin/backport-203248-to-release-22.11
(cherry picked from commit d00730bd373c850a33507094951b6cdbbaf16f0e)
| -rw-r--r-- | pkgs/development/libraries/gjs/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 540fe842c5a7..8b15bbf608d5 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.isLinux || stdenv.hostPlatform.isMusl) [ "-Dprofiler=disabled" ]; @@ -88,6 +88,9 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs build/choose-tests-locale.sh substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace installed-tests/js/meson.build \ + --replace "'Encoding'," "#'Encoding'," ''; preCheck = '' |