Skip to content

Commit 4600bce

Browse files
authored
elkhound, weidu: add darwin support (NixOS#372808)
2 parents 69538dc + 38f32ee commit 4600bce

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

pkgs/by-name/el/elkhound/package.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ stdenv.mkDerivation rec {
5050
homepage = "https://scottmcpeak.com/elkhound/";
5151
license = licenses.bsd3;
5252
maintainers = with maintainers; [ peterhoeg ];
53-
# possibly works on Darwin
54-
platforms = platforms.linux;
53+
platforms = platforms.unix;
5554
};
5655
}

pkgs/by-name/we/weidu/package.nix

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
ocaml-ng,
77
perl,
88
which,
9-
gnumake42,
9+
fetchpatch,
1010
}:
1111

1212
let
@@ -27,9 +27,17 @@ stdenv.mkDerivation rec {
2727
sha256 = "sha256-+vkKTzFZdAzY2dL+mZ4A0PDxhTKGgs9bfArz7S6b4m4=";
2828
};
2929

30+
patches = [
31+
(fetchpatch {
32+
url = "https://github.com/WeiDUorg/weidu/commit/bb90190d8bf7d102952c07d8288a7dc6c7a3322e.patch";
33+
hash = "sha256-Z4hHdMR1dYjJeERJSqlYynyPu2CvE6+XJuCr9ogDmvk=";
34+
})
35+
];
36+
3037
postPatch = ''
3138
substitute sample.Configuration Configuration \
3239
--replace /usr/bin ${lib.makeBinPath [ ocaml' ]} \
40+
--replace /usr/local/bin ${lib.makeBinPath [ ocaml' ]} \
3341
--replace elkhound ${elkhound}/bin/elkhound
3442
3543
mkdir -p obj/{.depend,x86_LINUX}
@@ -43,7 +51,6 @@ stdenv.mkDerivation rec {
4351
ocaml'
4452
perl
4553
which
46-
gnumake42
4754
];
4855

4956
buildFlags = [
@@ -69,7 +76,7 @@ stdenv.mkDerivation rec {
6976
homepage = "https://weidu.org";
7077
license = licenses.gpl2Only;
7178
maintainers = with maintainers; [ peterhoeg ];
72-
# should work fine on both Darwin and Windows
73-
platforms = platforms.linux;
79+
# should work fine on Windows
80+
platforms = platforms.unix;
7481
};
7582
}

0 commit comments

Comments
 (0)