A music player that connects to your cloud/distributed storage.
Fix yet another M1 issue with stack
+28
-7
+6
-6
flake.lock
+6
-6
flake.lock
···
32
32
},
33
33
"nixpkgs": {
34
34
"locked": {
35
-
"lastModified": 1662019588,
36
-
"narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
35
+
"lastModified": 1663357389,
36
+
"narHash": "sha256-oYA2nVRSi6yhCBqS5Vz465Hw+3BQOVFEhfbfy//3vTs=",
37
37
"owner": "NixOS",
38
38
"repo": "nixpkgs",
39
-
"rev": "2da64a81275b68fdad38af669afeda43d401e94b",
39
+
"rev": "da6a05816e7fa5226c3f61e285ef8d9dfc868f3c",
40
40
"type": "github"
41
41
},
42
42
"original": {
···
75
75
"nixpkgs": "nixpkgs_2"
76
76
},
77
77
"locked": {
78
-
"lastModified": 1662778811,
79
-
"narHash": "sha256-lpkekAbs8FNoqpbxuMpkdNMiRnWxDyvAyR+pWxW2PTs=",
78
+
"lastModified": 1663470205,
79
+
"narHash": "sha256-04OnrzLLWWE73GBpIgNR2NfjPH3MiHpwN1ueMQObsAc=",
80
80
"owner": "oxalica",
81
81
"repo": "rust-overlay",
82
-
"rev": "70d8df25fbe9cc5c74900b11d06ef120200f3948",
82
+
"rev": "2ac8be332f507e521c235caa37cb0b2fc698cbd9",
83
83
"type": "github"
84
84
},
85
85
"original": {
+22
-1
nix/shell.nix
+22
-1
nix/shell.nix
···
15
15
# -----
16
16
# Inspired by https://www.tweag.io/blog/2022-06-02-haskell-stack-nix-shell/
17
17
18
+
# https://github.com/NixOS/nixpkgs/issues/140774#issuecomment-976899227
19
+
m1HaskellPackages =
20
+
pkgs.haskellPackages.override {
21
+
overrides = self: super:
22
+
let
23
+
workaround140774 = hpkg: with pkgs.haskell.lib;
24
+
overrideCabal hpkg (drv: {
25
+
enableSeparateBinOutput = false;
26
+
});
27
+
in
28
+
{
29
+
ghcid = workaround140774 super.ghcid;
30
+
stack = workaround140774 super.stack;
31
+
};
32
+
};
33
+
18
34
stack-wrapped = symlinkJoin {
19
35
name = "stack";
20
-
paths = [ haskellPackages.stack ];
36
+
paths =
37
+
[ (if isM1Mac
38
+
then m1HaskellPackages.stack
39
+
else haskellPackages.stack
40
+
)
41
+
];
21
42
buildInputs = [ makeWrapper ];
22
43
postBuild = ''
23
44
wrapProgram $out/bin/stack \