Skip to content

Commit 853e15d

Browse files
create overlay to patch discord-rpc
fixes mudlet build failure caused by discord-rpc build failure. see discord/discord-rpc#387
1 parent 8c55ae2 commit 853e15d

File tree

4 files changed

+24
-3
lines changed

4 files changed

+24
-3
lines changed

flake.nix

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
}:
5757
let
5858
defaultUser = "adam";
59+
overlays = import ./overlays;
5960
in
6061
{
6162
apps =
@@ -77,15 +78,18 @@
7778
{ user ? defaultUser
7879
, system ? defaultDarwinSystem
7980
, modules
80-
,
8181
}:
8282
let
8383
specialArgs = (inputs // {
8484
inherit user system inputs;
8585
});
86+
pkgs = import nixpkgs {
87+
inherit system overlays;
88+
config.allowUnfree = true;
89+
};
8690
in
8791
darwin.lib.darwinSystem {
88-
inherit system specialArgs modules;
92+
inherit system specialArgs pkgs modules;
8993
};
9094
in
9195
{

home/mud/client.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ pkgs, ... }: {
22
home.packages = with pkgs; [
33
tintin
4-
# mudlet
4+
mudlet
55
];
66

77
# TinTin config files

overlays/default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[
2+
(import ./discord-rpc.nix)
3+
]

overlays/discord-rpc.nix

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
self: super: {
2+
# patch discord-rpc to fix build failure with clang, see https://github.com/discord/discord-rpc/pull/387
3+
discord-rpc = super.discord-rpc.overrideAttrs
4+
(previous: {
5+
version = "3.4.0";
6+
src = super.fetchFromGitHub {
7+
owner = "erratic-pattern";
8+
repo = "discord-rpc";
9+
rev = "master";
10+
hash = "sha256-nAWr7eW8EzKW3ji60cFTcv0NqZXaCrQRoyEidajtlDo=";
11+
};
12+
});
13+
}
14+

0 commit comments

Comments
 (0)