git.iko.soy/typeable/nixpkgs
on master help sign in
llvm: create all versioned symlinks for libLLVM on darwin

Apply eb31e481475 to older versions where applicable.

commit626a95a9b4299bed3ecdb4f5caec436c885cc0ac authorDaiderd Jordan <daiderd@gmail.com> dateSat 4 May 2019, 13:24 (8 years ago) parent807ba5f
4 files changed+39−24
pkgs/development/compilers/llvm/3.9/llvm.nix+10−6 pkgs/development/compilers/llvm/4/llvm.nix+10−6 pkgs/development/compilers/llvm/5/llvm.nix+10−6 pkgs/development/compilers/llvm/6/llvm.nix+9−6
pkgs/development/compilers/llvm/3.9/llvm.nix+10−6
@@ -22,10 +22,13 @@ assert (stdenv.hostPlatform != stdenv.buildPlatform) -> !enableSharedLibraries;
2222let
2323 src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z";
2424
25− # Used when creating a version-suffixed symlink of libLLVM.dylib
26− shortVersion = with stdenv.lib;
27− concatStringsSep "." (take 2 (splitString "." version));
28−in stdenv.mkDerivation rec {
25+ # Used when creating a versioned symlinks of libLLVM.dylib
26+ versionSuffixes = with stdenv.lib;
27+ let parts = splitString "." version; in
28+ imap (i: _: concatStringsSep "." (take i parts)) parts;
29+in
30+
31+stdenv.mkDerivation {
2932 name = "llvm-${version}";
3033
3134 unpackPhase = ''
@@ -153,8 +156,9 @@ in stdenv.mkDerivation rec {
153156 + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
154157 substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
155158 --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
156− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
157− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${version}.dylib
159+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
160+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
161+ '') versionSuffixes}
158162 '';
159163
160164 enableParallelBuilding = true;
pkgs/development/compilers/llvm/4/llvm.nix+10−6
@@ -19,10 +19,13 @@
1919let
2020 src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s";
2121
22− # Used when creating a version-suffixed symlink of libLLVM.dylib
23− shortVersion = with stdenv.lib;
24− concatStringsSep "." (take 2 (splitString "." release_version));
25−in stdenv.mkDerivation (rec {
22+ # Used when creating a versioned symlinks of libLLVM.dylib
23+ versionSuffixes = with stdenv.lib;
24+ let parts = splitString "." release_version; in
25+ imap (i: _: concatStringsSep "." (take i parts)) parts;
26+in
27+
28+stdenv.mkDerivation (rec {
2629 name = "llvm-${version}";
2730
2831 unpackPhase = ''
@@ -136,8 +139,9 @@ in stdenv.mkDerivation (rec {
136139 + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
137140 substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
138141 --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
139− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
140− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
142+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
143+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
144+ '') versionSuffixes}
141145 '';
142146
143147 doCheck = stdenv.isLinux && (!stdenv.isi686);
pkgs/development/compilers/llvm/5/llvm.nix+10−6
@@ -18,10 +18,13 @@
1818let
1919 src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm";
2020
21− # Used when creating a version-suffixed symlink of libLLVM.dylib
22− shortVersion = with stdenv.lib;
23− concatStringsSep "." (take 2 (splitString "." release_version));
24−in stdenv.mkDerivation (rec {
21+ # Used when creating a versioned symlinks of libLLVM.dylib
22+ versionSuffixes = with stdenv.lib;
23+ let parts = splitString "." release_version; in
24+ imap (i: _: concatStringsSep "." (take i parts)) parts;
25+in
26+
27+stdenv.mkDerivation (rec {
2528 name = "llvm-${version}";
2629
2730 unpackPhase = ''
@@ -119,8 +122,9 @@ in stdenv.mkDerivation (rec {
119122 substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
120123 --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" \
121124 --replace "\''${_IMPORT_PREFIX}/lib/libLTO.dylib" "$lib/lib/libLTO.dylib"
122− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
123− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
125+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
126+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
127+ '') versionSuffixes}
124128 '';
125129
126130 doCheck = stdenv.isLinux && (!stdenv.isi686);
pkgs/development/compilers/llvm/6/llvm.nix+9−6
@@ -21,11 +21,13 @@ let
2121
2222 src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn";
2323
24− # Used when creating a version-suffixed symlink of libLLVM.dylib
25− shortVersion = with stdenv.lib;
26− concatStringsSep "." (take 2 (splitString "." release_version));
24+ # Used when creating a versioned symlinks of libLLVM.dylib
25+ versionSuffixes = with stdenv.lib;
26+ let parts = splitString "." release_version; in
27+ imap (i: _: concatStringsSep "." (take i parts)) parts;
28+in
2729
28−in stdenv.mkDerivation (rec {
30+stdenv.mkDerivation (rec {
2931 name = "llvm-${version}";
3032
3133 unpackPhase = ''
@@ -133,8 +135,9 @@ in stdenv.mkDerivation (rec {
133135 + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
134136 substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
135137 --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
136− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
137− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
138+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
139+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
140+ '') versionSuffixes}
138141 '';
139142
140143 doCheck = stdenv.isLinux && (!stdenv.isi686);