From 37ff37e3b2f43c8dd082deb8e4399e605c860f38 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Thu, 1 Apr 2021 16:10:31 +0200
Subject: [PATCH] [nix] use extend mechanism also for non-default llvm versions
---
nix/default.nix | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/nix/default.nix b/nix/default.nix
index e6b4407e..6decd85c 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -10,7 +10,6 @@ let frama_clang_build =
llvm_version,
llvm?pkgs.${"llvm_"+llvm_version},
llvm_package?pkgs.${"llvmPackages_"+llvm_version} } :
-
(plugins.helpers.simple_plugin
{ inherit pkgs stdenv src opam2nix ocaml_version plugins;
name = "frama-clang-on-llvm-" + llvm_version;
@@ -34,5 +33,8 @@ in
let new_pkgs = import newer_nix {};
in
(frama_clang_build { llvm_version="9"; })
-// { on-llvm10 = (frama_clang_build { llvm_version="10"; });}
-// { on-llvm11 = (frama_clang_build { pkgs = new_pkgs; llvm_version="11";});}
+ .extend(
+ self: super:
+ { on-llvm10 = (frama_clang_build { llvm_version="10"; });
+ on-llvm11 = (frama_clang_build { pkgs = new_pkgs; llvm_version="11";});
+ })
--
GitLab