abonerib/bscpkgs
Archived
1
0
Fork 0
forked from rarias/bscpkgs
Code Pull Requests 1 Activity

clangOmpss2: merge both nix files into one

Browse Source 
Add clangOmpss2Git to the overlay overriding the src attribute of the
release nix derivation, so we only keep one derivation for both
variants.
This commit is contained in:
Rodrigo Arias
2022-02-21 16:03:41 +01:00
parent a2195aef43
commit df7c79f34b
2 changed files with 13 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
overlay.nix
View File

@@ -61,11 +61,24 @@ let
stdenv = bsc.llvmPackages.stdenv;
};
clangOmpss2UnwrappedGit = bsc.clangOmpss2Unwrapped.overrideAttrs (old: rec {
src = builtins.fetchGit {
url = "ssh://git@bscpm03.bsc.es/llvm-ompss/llvm-mono.git";
ref = "master";
};
version = src.shortRev;
});
clangOmpss2 = appendPasstru (
callPackage ./bsc/llvm-ompss2/default.nix {
clangOmpss2Unwrapped = bsc.clangOmpss2Unwrapped;
}) { CC = "clang"; CXX = "clang++"; };
clangOmpss2Git = appendPasstru (
callPackage ./bsc/llvm-ompss2/default.nix {
clangOmpss2Unwrapped = bsc.clangOmpss2UnwrappedGit;
}) { CC = "clang"; CXX = "clang++"; };
mcxx = bsc.mcxxRelease;
mcxxRelease = callPackage ./bsc/mcxx/default.nix { };
mcxxGit = callPackage ./bsc/mcxx/git.nix { };