Skip to content

Commit a3bcbb0

Browse files
authored
xmrig: move to pkgs/by-name, use new apple sdk pattern (#370297)
2 parents f9f5325 + 6f2ff58 commit a3bcbb0

File tree

5 files changed

+5
-28
lines changed

5 files changed

+5
-28
lines changed

pkgs/applications/misc/xmrig/proxy.nix renamed to pkgs/by-name/xm/xmrig-proxy/package.nix

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@
66
libuv,
77
libmicrohttpd,
88
openssl,
9-
darwin,
109
}:
1110

12-
let
13-
inherit (darwin.apple_sdk_11_0.frameworks) CoreServices IOKit;
14-
in
1511
stdenv.mkDerivation rec {
1612
pname = "xmrig-proxy";
1713
version = "6.22.0";
@@ -35,16 +31,11 @@ stdenv.mkDerivation rec {
3531
cmake
3632
];
3733

38-
buildInputs =
39-
[
40-
libuv
41-
libmicrohttpd
42-
openssl
43-
]
44-
++ lib.optionals stdenv.hostPlatform.isDarwin [
45-
CoreServices
46-
IOKit
47-
];
34+
buildInputs = [
35+
libuv
36+
libmicrohttpd
37+
openssl
38+
];
4839

4940
installPhase = ''
5041
runHook preInstall

pkgs/applications/misc/xmrig/default.nix renamed to pkgs/by-name/xm/xmrig/package.nix

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@
77
, openssl
88
, hwloc
99
, donateLevel ? 0
10-
, darwin
1110
}:
1211

13-
let
14-
inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL;
15-
in
1612
stdenv.mkDerivation rec {
1713
pname = "xmrig";
1814
version = "6.22.2";
@@ -43,10 +39,6 @@ stdenv.mkDerivation rec {
4339
libmicrohttpd
4440
openssl
4541
hwloc
46-
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
47-
Carbon
48-
CoreServices
49-
OpenCL
5042
];
5143

5244
inherit donateLevel;

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14594,12 +14594,6 @@ with pkgs;
1459414594
inherit (darwin.apple_sdk.frameworks) CoreServices;
1459514595
};
1459614596

14597-
xmrig = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig { };
14598-
14599-
xmrig-mo = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/moneroocean.nix { };
14600-
14601-
xmrig-proxy = darwin.apple_sdk_11_0.callPackage ../applications/misc/xmrig/proxy.nix { };
14602-
1460314597
monotone = callPackage ../applications/version-management/monotone {
1460414598
lua = lua5;
1460514599
};

0 commit comments

Comments
 (0)