diff options
author | Nick Cao <nickcao@nichi.co> | 2024-04-14 11:11:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-14 11:11:45 -0400 |
commit | 5f81b2812ea76d998cb25a3491cce03093326cb2 (patch) | |
tree | 6d79119c3b8f37cfe9270d4d9d5792f4ce02b817 | |
parent | 689c67d2ccde63fbcaee89f90f66aa92d918cf6c (diff) | |
parent | 97db26f1cf6efdf7a590d729d2ed380fa259f590 (diff) |
Merge pull request #302719 from NickCao/fw-ectool
fw-ectool: unstable-2022-12-03 -> 0-unstable-2023-12-15, switch upstream
-rw-r--r-- | pkgs/os-specific/linux/fw-ectool/default.nix | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/pkgs/os-specific/linux/fw-ectool/default.nix b/pkgs/os-specific/linux/fw-ectool/default.nix index a73cc1896ecdc..1d23411f3eefc 100644 --- a/pkgs/os-specific/linux/fw-ectool/default.nix +++ b/pkgs/os-specific/linux/fw-ectool/default.nix @@ -1,38 +1,43 @@ { stdenv , lib -, fetchFromGitHub +, fetchFromGitLab +, cmake , pkg-config -, hostname +, libusb1 +, libftdi1 }: stdenv.mkDerivation { pname = "fw-ectool"; - version = "unstable-2022-12-03"; + version = "0-unstable-2023-12-15"; - src = fetchFromGitHub { + src = fetchFromGitLab { + domain = "gitlab.howett.net"; owner = "DHowett"; - repo = "fw-ectool"; - rev = "54c140399bbc3e6a3dce6c9f842727c4128367be"; - hash = "sha256-2teJFz4zcA+USpbVPXMEIHLdmMLem8ik7YrmrSxr/n0="; + repo = "ectool"; + rev = "3ebe7b8b713b2ebfe2ce92d48fd8d044276b2879"; + hash = "sha256-s6PrFPAL+XJAENqLw5oJqFmAf11tHOJ8h3F5l3pOlZ4="; }; nativeBuildInputs = [ + cmake pkg-config - hostname ]; - buildPhase = '' - patchShebangs util - make out=out utils - ''; + buildInputs = [ + libusb1 + libftdi1 + ]; installPhase = '' - install -D out/util/ectool $out/bin/ectool + runHook preInstall + install -Dm555 src/ectool "$out/bin/ectool" + runHook postInstall ''; meta = with lib; { description = "EC-Tool adjusted for usage with framework embedded controller"; - homepage = "https://github.com/DHowett/framework-ec"; + homepage = "https://gitlab.howett.net/DHowett/ectool"; license = licenses.bsd3; maintainers = [ maintainers.mkg20001 ]; platforms = platforms.linux; |