From ff30e7ae387da6981370e346d17e474eb48597c2 Mon Sep 17 00:00:00 2001
From: Michele Alberti <michele.alberti@cea.fr>
Date: Thu, 6 Aug 2020 10:44:29 +0200
Subject: [PATCH] [Nix] Fetch and use unstable packages with RTTI fix.
---
nix/default.nix | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/nix/default.nix b/nix/default.nix
index 9eb64bdc..3d11081f 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -2,10 +2,19 @@
{ pkgs, stdenv, src ? ../., opam2nix,
ocaml_version ? "ocamlPackages_latest.ocaml", plugins ? { } }:
+let
+ unstablePckgs = import (builtins.fetchGit {
+ # Descriptive name to make the store path easier to identify
+ name = "With-RTTI-fix";
+ url = "https://github.com/nixos/nixpkgs-channels/";
+ ref = "refs/heads/nixpkgs-unstable";
+ rev = "0f0b14258be090303c5013c2e29234040fa9766c";
+ }) {};
+in
plugins.helpers.simple_plugin
{ inherit pkgs stdenv src opam2nix ocaml_version plugins;
name = "frama-clang";
- deps = [ pkgs.llvmPackages_9.clang-unwrapped pkgs.llvm_9 pkgs.gnused ];
+ deps = [ unstablePckgs.llvmPackages_9.clang-unwrapped unstablePckgs.llvm_9 pkgs.gnused ];
opamPackages = [ "camlp5" ];
- configure_options = "-with-clang-includedir=${pkgs.llvmPackages_9.clang-unwrapped}";
+ configure_options = "-with-clang-includedir=${unstablePckgs.llvmPackages_9.clang-unwrapped}";
}
--
GitLab