File tree Expand file tree Collapse file tree 4 files changed +24
-3
lines changed Expand file tree Collapse file tree 4 files changed +24
-3
lines changed Original file line number Diff line number Diff line change 56
56
} :
57
57
let
58
58
defaultUser = "adam" ;
59
+ overlays = import ./overlays ;
59
60
in
60
61
{
61
62
apps =
77
78
{ user ? defaultUser
78
79
, system ? defaultDarwinSystem
79
80
, modules
80
- ,
81
81
} :
82
82
let
83
83
specialArgs = ( inputs // {
84
84
inherit user system inputs ;
85
85
} ) ;
86
+ pkgs = import nixpkgs {
87
+ inherit system overlays ;
88
+ config . allowUnfree = true ;
89
+ } ;
86
90
in
87
91
darwin . lib . darwinSystem {
88
- inherit system specialArgs modules ;
92
+ inherit system specialArgs pkgs modules ;
89
93
} ;
90
94
in
91
95
{
Original file line number Diff line number Diff line change 1
1
{ pkgs , ... } : {
2
2
home . packages = with pkgs ; [
3
3
tintin
4
- # mudlet
4
+ mudlet
5
5
] ;
6
6
7
7
# TinTin config files
Original file line number Diff line number Diff line change
1
+ [
2
+ ( import ./discord-rpc.nix )
3
+ ]
Original file line number Diff line number Diff line change
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
+
You can’t perform that action at this time.
0 commit comments