From d2f58a05dd027aac851ed154c8a05f851965533d Mon Sep 17 00:00:00 2001 From: Linnnus Date: Sat, 21 Dec 2024 12:40:50 +0100 Subject: Revert "pkgs/cscript: Use unstable LLVM" This reverts commit a2f2f142a64ea34637e1586728d6e4e33553040f. The temporary fix is no longer needed, as we are now running a nixpkgs version which includes nixos/nixpkgs#309165. --- pkgs/cscript/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgs/cscript/default.nix') diff --git a/pkgs/cscript/default.nix b/pkgs/cscript/default.nix index a3ebeea..bfbb58b 100644 --- a/pkgs/cscript/default.nix +++ b/pkgs/cscript/default.nix @@ -2,9 +2,7 @@ stdenv, lib, fetchFromGitHub, - # 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, + llvmPackages, }: let self = stdenv.mkDerivation rec { pname = "cscript"; @@ -20,8 +18,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 "${unstable.llvmPackages.clang}/bin/clang"; - lldbPathLiteral = toStringLiteral "${unstable.llvmPackages.lldb}/bin/lldb"; + ccPathLiteral = toStringLiteral "${llvmPackages.clang}/bin/clang"; + lldbPathLiteral = toStringLiteral "${llvmPackages.lldb}/bin/lldb"; in '' substituteInPlace cscript.c \ --replace-fail '"cc"' ${ccPathLiteral} \ -- cgit v1.2.3