aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix2
3 files changed, 5 insertions, 5 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix
index 4f5e20cfe770..2de5f65b4a13 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix
@@ -20,10 +20,10 @@ let
'';
nativeBuildInputs = [ cmake python3 lld ]
- ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
+ ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx
+ ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
- buildInputs = [ libxml2 llvm ]
- ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+ buildInputs = [ libxml2 llvm ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++14"
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix
index a404d1606957..e6765ec68990 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/default.nix
@@ -7,7 +7,7 @@
let
release_version = "11.0.0";
- version = "${release_version}"; # differentiating these (variables) is important for RCs
+ version = release_version; # differentiating these (variables) is important for RCs
targetConfig = stdenv.targetPlatform.config;
fetch = name: sha256: fetchurl {
diff --git a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix
index 3f37cac078f9..c2b70a149bf5 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix
@@ -163,7 +163,7 @@ in stdenv.mkDerivation (rec {
description = "Collection of modular and reusable compiler and toolchain technologies";
homepage = "https://llvm.org/";
license = stdenv.lib.licenses.ncsa;
- maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ];
+ maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill primeos ];
platforms = stdenv.lib.platforms.all;
};
} // stdenv.lib.optionalAttrs enableManpages {