From a343adb3ad251c6032df9c4828ef1ef8781c83f5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 11 Jan 2025 02:12:12 +0100 Subject: [PATCH 1/2] elkhound: add darwin support --- pkgs/by-name/el/elkhound/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/el/elkhound/package.nix b/pkgs/by-name/el/elkhound/package.nix index a5f4b3543fc42..3be9fcced3be3 100644 --- a/pkgs/by-name/el/elkhound/package.nix +++ b/pkgs/by-name/el/elkhound/package.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://scottmcpeak.com/elkhound/"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; - # possibly works on Darwin - platforms = platforms.linux; + platforms = platforms.unix; }; } From 38f32ee49ef9cf711bb97b110fca9379063b4b37 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 11 Jan 2025 02:12:24 +0100 Subject: [PATCH 2/2] weidu: add darwin support --- pkgs/by-name/we/weidu/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/we/weidu/package.nix b/pkgs/by-name/we/weidu/package.nix index a8ca4c2422dee..02b4b13371a56 100644 --- a/pkgs/by-name/we/weidu/package.nix +++ b/pkgs/by-name/we/weidu/package.nix @@ -6,7 +6,7 @@ ocaml-ng, perl, which, - gnumake42, + fetchpatch, }: let @@ -27,9 +27,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-+vkKTzFZdAzY2dL+mZ4A0PDxhTKGgs9bfArz7S6b4m4="; }; + patches = [ + (fetchpatch { + url = "https://github.com/WeiDUorg/weidu/commit/bb90190d8bf7d102952c07d8288a7dc6c7a3322e.patch"; + hash = "sha256-Z4hHdMR1dYjJeERJSqlYynyPu2CvE6+XJuCr9ogDmvk="; + }) + ]; + postPatch = '' substitute sample.Configuration Configuration \ --replace /usr/bin ${lib.makeBinPath [ ocaml' ]} \ + --replace /usr/local/bin ${lib.makeBinPath [ ocaml' ]} \ --replace elkhound ${elkhound}/bin/elkhound mkdir -p obj/{.depend,x86_LINUX} @@ -43,7 +51,6 @@ stdenv.mkDerivation rec { ocaml' perl which - gnumake42 ]; buildFlags = [ @@ -69,7 +76,7 @@ stdenv.mkDerivation rec { homepage = "https://weidu.org"; license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; - # should work fine on both Darwin and Windows - platforms = platforms.linux; + # should work fine on Windows + platforms = platforms.unix; }; }