From a2f2f142a64ea34637e1586728d6e4e33553040f Mon Sep 17 00:00:00 2001 From: Linnnus Date: Thu, 28 Nov 2024 11:29:36 +0100 Subject: pkgs/cscript: Use unstable LLVM --- pkgs/cscript/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pkgs/cscript/default.nix') diff --git a/pkgs/cscript/default.nix b/pkgs/cscript/default.nix index bfbb58b..a3ebeea 100644 --- a/pkgs/cscript/default.nix +++ b/pkgs/cscript/default.nix @@ -2,7 +2,9 @@ stdenv, lib, fetchFromGitHub, - llvmPackages, + # TODO: I think the PR will become part of 24.11, at which point this becomes unnecessary. + # TEMP: We unstable for NixOS/nixpkgs#309165 for LLDB to work on Darwin. + unstable, }: let self = stdenv.mkDerivation rec { pname = "cscript"; @@ -18,8 +20,8 @@ # Instead of using the system CC and LLDB (impure), use the most recent LLVM release. postPatch = let toStringLiteral = lib.flip lib.pipe [builtins.toJSON lib.strings.escapeShellArg]; - ccPathLiteral = toStringLiteral "${llvmPackages.clang}/bin/clang"; - lldbPathLiteral = toStringLiteral "${llvmPackages.lldb}/bin/lldb"; + ccPathLiteral = toStringLiteral "${unstable.llvmPackages.clang}/bin/clang"; + lldbPathLiteral = toStringLiteral "${unstable.llvmPackages.lldb}/bin/lldb"; in '' substituteInPlace cscript.c \ --replace-fail '"cc"' ${ccPathLiteral} \ -- cgit v1.2.3