nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-12 00:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #188924 from McSinyx/klee-llvm

Browse Source 
klee: use the same LLVM version for clang
This commit is contained in:
K900 2022-09-15 10:36:25 +03:00 committed by GitHub
commit 42dc5a7269
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/science/logic/klee/default.nix
View File

@ -1,9 +1,10 @@
{ lib { lib
, stdenv
, callPackage , callPackage
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, llvmPackages_11
, clang , clang
, llvm
, python3 , python3
, zlib , zlib
, z3 , z3
@ -35,18 +36,14 @@
}: }:
let let
# Python used for KLEE tests. # Python used for KLEE tests.
kleePython = python3.withPackages (ps: with ps; [ tabulate ]); kleePython = python3.withPackages (ps: with ps; [ tabulate ]);
# The klee-uclibc derivation. # The klee-uclibc derivation.
kleeuClibc = callPackage ./klee-uclibc.nix { kleeuClibc = callPackage ./klee-uclibc.nix {
inherit clang llvmPackages_11 extraKleeuClibcConfig debugRuntime runtimeAsserts; inherit stdenv clang llvm extraKleeuClibcConfig debugRuntime runtimeAsserts;
}; };
in stdenv.mkDerivation rec {
in
clang.stdenv.mkDerivation rec {
pname = "klee"; pname = "klee";
version = "2.3"; version = "2.3";
@ -61,7 +58,7 @@ clang.stdenv.mkDerivation rec {
cryptominisat cryptominisat
gperftools gperftools
lit # Configure phase checking for lit lit # Configure phase checking for lit
llvmPackages_11.llvm llvm
sqlite sqlite
stp stp
z3 z3

8
pkgs/applications/science/logic/klee/klee-uclibc.nix
View File

@ -1,10 +1,11 @@
{ lib { lib
, stdenv
, fetchurl , fetchurl
, fetchFromGitHub , fetchFromGitHub
, which , which
, linuxHeaders , linuxHeaders
, clang , clang
, llvmPackages_11 , llvm
, python3 , python3
, curl , curl
, debugRuntime ? true , debugRuntime ? true
@ -23,8 +24,7 @@ let
"RUNTIME_PREFIX" = "/"; "RUNTIME_PREFIX" = "/";
"DEVEL_PREFIX" = "/"; "DEVEL_PREFIX" = "/";
}); });
in in stdenv.mkDerivation rec {
clang.stdenv.mkDerivation rec {
pname = "klee-uclibc"; pname = "klee-uclibc";
version = "1.3"; version = "1.3";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -37,7 +37,7 @@ clang.stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
clang clang
curl curl
llvmPackages_11.llvm llvm
python3 python3
which which
]; ];

6
pkgs/top-level/all-packages.nix
View File

@ -28999,7 +28999,11 @@ with pkgs;
klayout = libsForQt5.callPackage ../applications/misc/klayout { }; klayout = libsForQt5.callPackage ../applications/misc/klayout { };
klee = callPackage ../applications/science/logic/klee { }; klee = callPackage ../applications/science/logic/klee (with llvmPackages_11; {
clang = clang;
llvm = llvm;
stdenv = stdenv;
});
kmetronome = libsForQt5.callPackage ../applications/audio/kmetronome { }; kmetronome = libsForQt5.callPackage ../applications/audio/kmetronome { };