diff options
author | Vladimír Čunát <v@cunat.cz> | 2024-04-12 07:06:54 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2024-04-12 07:06:54 +0200 |
commit | 24d4f2cd52fc44f375e60ab4c90e159193689d72 (patch) | |
tree | 113c1984373abdd81ca189e25fa76396a55706bc /pkgs/development/compilers/llvm | |
parent | 4cfc319ea877f057cb7ad0c455c6af52e72bc557 (diff) | |
parent | 993400aeecf5ce185586dded2cebccebd628ec93 (diff) |
Merge branch 'staging' into staging-next
Conflicts (tried to quickly resolve somehow, checked eval): pkgs/development/python-modules/apsw/default.nix pkgs/development/python-modules/mido/default.nix pkgs/development/python-modules/pytest-bdd/default.nix pkgs/development/python-modules/sparse/default.nix
Diffstat (limited to 'pkgs/development/compilers/llvm')
-rw-r--r-- | pkgs/development/compilers/llvm/17/llvm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/18/llvm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/git/llvm/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/llvm/17/llvm/default.nix b/pkgs/development/compilers/llvm/17/llvm/default.nix index ec2edabe4ec5f..a045bea9f4728 100644 --- a/pkgs/development/compilers/llvm/17/llvm/default.nix +++ b/pkgs/development/compilers/llvm/17/llvm/default.nix @@ -8,7 +8,7 @@ , python3 , python3Packages , libffi -, enableGoldPlugin ? true +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 diff --git a/pkgs/development/compilers/llvm/18/llvm/default.nix b/pkgs/development/compilers/llvm/18/llvm/default.nix index 670171a707f9c..a9732763e9d7b 100644 --- a/pkgs/development/compilers/llvm/18/llvm/default.nix +++ b/pkgs/development/compilers/llvm/18/llvm/default.nix @@ -8,7 +8,7 @@ , python3 , python3Packages , libffi -, enableGoldPlugin ? true +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 670171a707f9c..a9732763e9d7b 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -8,7 +8,7 @@ , python3 , python3Packages , libffi -, enableGoldPlugin ? true +, enableGoldPlugin ? libbfd.hasPluginAPI , libbfd , libpfm , libxml2 |