From a85713897060ba8e2f3ed65d0fdce1b6776dd6d5 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Tue, 7 Jan 2025 08:15:38 +0000 Subject: [PATCH] imhex: unpin LLVM17; darwin cleanup default llvm is now llvm 19 default darwin sdk on all platforms is 11.3 --- pkgs/by-name/im/imhex/package.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index 5f18c1ec4bf0..b9ab55fc993b 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -2,7 +2,7 @@ lib, stdenv, cmake, - llvmPackages_17, + llvm, fetchFromGitHub, mbedtls, gtk3, @@ -24,21 +24,12 @@ nix-update-script, autoPatchelfHook, makeWrapper, - overrideSDK, }: let version = "1.36.2"; patterns_version = "1.36.2"; - llvmPackages = llvmPackages_17; - - stdenv' = - let - baseStdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - in - if stdenv.hostPlatform.isDarwin then overrideSDK baseStdenv "11.0" else baseStdenv; - patterns_src = fetchFromGitHub { name = "ImHex-Patterns-source-${patterns_version}"; owner = "WerWolv"; @@ -48,7 +39,7 @@ let }; in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "imhex"; inherit version; @@ -65,7 +56,7 @@ stdenv'.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - llvmPackages.llvm + llvm python3 perl pkg-config