diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-11-17 20:43:19 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-12-04 16:59:13 +0000 |
| commit | 164de1888076cb0b79555d488b18a4bc82aac7b4 (patch) | |
| tree | 23e3a2f7c23b64d6a12b6f43979a751e2f6a444d /overlays | |
| parent | 4d9060b5551bd1af8002b0dac0cbdcb97ddeb301 (diff) | |
| download | nixlib-164de1888076cb0b79555d488b18a4bc82aac7b4.tar nixlib-164de1888076cb0b79555d488b18a4bc82aac7b4.tar.gz nixlib-164de1888076cb0b79555d488b18a4bc82aac7b4.tar.bz2 nixlib-164de1888076cb0b79555d488b18a4bc82aac7b4.tar.lz nixlib-164de1888076cb0b79555d488b18a4bc82aac7b4.tar.xz nixlib-164de1888076cb0b79555d488b18a4bc82aac7b4.tar.zst nixlib-164de1888076cb0b79555d488b18a4bc82aac7b4.zip | |
patches/thunderbird: build with more recent LLVM
Thunderbird latest fails to build with anything more recent than LLVM 8.
Diffstat (limited to 'overlays')
| -rw-r--r-- | overlays/patches/default.nix | 10 | ||||
| -rw-r--r-- | overlays/patches/thunderbird/default.nix | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/overlays/patches/default.nix b/overlays/patches/default.nix index 5cf3c7a37992..9e15bc31c3b4 100644 --- a/overlays/patches/default.nix +++ b/overlays/patches/default.nix @@ -18,8 +18,14 @@ self: super: { python3 = self.callPackage ./python { python = super.python3; }; - thunderbird = self.callPackage ./thunderbird { inherit (super) thunderbird; }; - thunderbird-68 = self.callPackage ./thunderbird { thunderbird = super.thunderbird-68; }; + thunderbird = self.callPackage ./thunderbird { + inherit (super) thunderbird; + llvmPackages = self.llvmPackages_8; + }; + thunderbird-68 = self.callPackage ./thunderbird { + thunderbird = super.thunderbird-68; + llvmPackages = self.llvmPackages_latest; + }; tmux = self.callPackage ./tmux { inherit (super) tmux; }; diff --git a/overlays/patches/thunderbird/default.nix b/overlays/patches/thunderbird/default.nix index 79b489ee98b8..f6dd6ac0326f 100644 --- a/overlays/patches/thunderbird/default.nix +++ b/overlays/patches/thunderbird/default.nix @@ -1,5 +1,5 @@ -{ thunderbird, clangStdenv, ... } @ args: +{ thunderbird, llvmPackages, ... } @ args: thunderbird.override ({ - stdenv = clangStdenv; -} // (builtins.removeAttrs args [ "clangStdenv" "thunderbird" ])) + inherit (llvmPackages) stdenv; +} // (builtins.removeAttrs args [ "llvmPackages" "thunderbird" ])) |