diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2023-07-18 13:55:28 +0200 |
---|---|---|
committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-08-06 00:55:37 +0200 |
commit | d47082aa9a33d295328f9160cdad9517baf2234b (patch) | |
tree | ac113644ed4a043af09fa8a0e983286191e27ed9 /pkgs/development/compilers/crystal | |
parent | c447ba5801ec3055a5e33fcbfba35649a8a1301e (diff) |
crystal: correct usage of darwin.apple_sdk_11_0
Diffstat (limited to 'pkgs/development/compilers/crystal')
-rw-r--r-- | pkgs/development/compilers/crystal/default.nix | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 48dd456bcb2f..9f2e17dad09d 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -17,7 +17,8 @@ , libxml2 , libyaml , libffi -, llvmPackages +, llvmPackages_13 +, llvmPackages_15 , makeWrapper , openssl , pcre2 @@ -53,28 +54,29 @@ let "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; genericBinary = { version, sha256s, rel ? 1 }: - stdenv.mkDerivation rec { - pname = "crystal-binary"; - inherit version; + stdenv.mkDerivation rec { + pname = "crystal-binary"; + inherit version; - src = fetchurl { - url = binaryUrl version rel; - sha256 = sha256s.${stdenv.system}; - }; + src = fetchurl { + url = binaryUrl version rel; + sha256 = sha256s.${stdenv.system}; + }; - buildCommand = '' - mkdir -p $out - tar --strip-components=1 -C $out -xf ${src} - patchShebangs $out/bin/crystal - ''; + buildCommand = '' + mkdir -p $out + tar --strip-components=1 -C $out -xf ${src} + patchShebangs $out/bin/crystal + ''; - meta.platforms = lib.attrNames sha256s; - }; + meta.platforms = lib.attrNames sha256s; + }; - generic = ( + generic = { version , sha256 , binary + , llvmPackages , doCheck ? true , extraBuildInputs ? [ ] , buildFlags ? [ "all" "docs" "release=1"] @@ -244,9 +246,7 @@ let license = licenses.asl20; maintainers = with maintainers; [ david50407 manveru peterhoeg donovanglover ]; }; - }) - ); - + }); in rec { binaryCrystal_1_2 = genericBinary { @@ -263,6 +263,7 @@ rec { version = "1.2.2"; sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; binary = binaryCrystal_1_2; + llvmPackages = llvmPackages_13; extraBuildInputs = [ libatomic_ops ]; }; @@ -270,18 +271,21 @@ rec { version = "1.7.3"; sha256 = "sha256-ULhLGHRIZbsKhaMvNhc+W74BwNgfEjHcMnVNApWY+EE="; binary = binaryCrystal_1_2; + llvmPackages = llvmPackages_13; }; crystal_1_8 = generic { version = "1.8.2"; sha256 = "sha256-YAORdipzpC9CrFgZUFlFfjzlJQ6ZeA2ekVu8IfPOxR8="; binary = binaryCrystal_1_2; + llvmPackages = llvmPackages_15; }; crystal_1_9 = generic { version = "1.9.2"; sha256 = "sha256-M1oUFs7/8ljszga3StzLOLM1aA4fSfVPQlsbuDHGd84="; binary = binaryCrystal_1_2; + llvmPackages = llvmPackages_15; }; crystal = crystal_1_9; |