From 8c9eaf0ceb439338d1d4688aa8e7be670cfcbf1e Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sat, 8 Mar 2025 17:12:07 -0800 Subject: [PATCH] clasp-common-lisp: 2.6.0 -> 2.7.0 --- pkgs/development/compilers/clasp/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/clasp/default.nix b/pkgs/development/compilers/clasp/default.nix index cae4fa08e4e7..3879d0e7360a 100644 --- a/pkgs/development/compilers/clasp/default.nix +++ b/pkgs/development/compilers/clasp/default.nix @@ -1,6 +1,6 @@ { lib, - llvmPackages_15, + llvmPackages_18, fetchzip, sbcl, pkg-config, @@ -13,16 +13,16 @@ }: let - inherit (llvmPackages_15) stdenv llvm libclang; + inherit (llvmPackages_18) stdenv llvm libclang; in stdenv.mkDerivation rec { pname = "clasp"; - version = "2.6.0"; + version = "2.7.0"; src = fetchzip { url = "https://github.com/clasp-developers/clasp/releases/download/${version}/clasp-${version}.tar.gz"; - hash = "sha256-SiQ4RMha6dMV7V2fh+UxtAIgEEH/6/hF9fe+bPtoGIw="; + hash = "sha256-IoEwsMvY/bbb6K6git+7zRGP0DIJDROt69FBQuzApRk="; }; patches = [ @@ -64,7 +64,14 @@ stdenv.mkDerivation rec { --package-path=/ \ --bin-path=$out/bin \ --lib-path=$out/lib \ - --share-path=$out/share + --dylib-path=$out/lib \ + --share-path=$out/share \ + --pkgconfig-path=$out/lib/pkgconfig + ''; + + postInstall = '' + # --dylib-path not honored. Fix it in post. + mv $out/libclasp* $out/lib/ ''; meta = {