diff --git a/pkgs/by-name/dd/ddccontrol/package.nix b/pkgs/by-name/dd/ddccontrol/package.nix index 8cc71aa06291..d5d162eb21b7 100644 --- a/pkgs/by-name/dd/ddccontrol/package.nix +++ b/pkgs/by-name/dd/ddccontrol/package.nix @@ -7,35 +7,46 @@ autoreconfHook, intltool, pkg-config, + rustPlatform, + cargo, + rustc, # buildInputs libxml2, pciutils, - gtk2, + gtk3, ddccontrol-db, }: stdenv.mkDerivation (finalAttrs: { pname = "ddccontrol"; - version = "1.0.3"; + version = "3.2.0"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; tag = finalAttrs.version; - sha256 = "sha256-qyD6i44yH3EufIW+LA/LBMW20Tejb49zvsDfv6YFD6c="; + sha256 = "sha256-8VqnmWLXt6rXapAqvzvtDQ9XjQ7H6s7pLqPhQ6Zflc4="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-UN308Tt9LCRLBSswem06UupjdIFntt6SqpTxteY5O78="; }; nativeBuildInputs = [ autoreconfHook intltool pkg-config + rustPlatform.cargoSetupHook + cargo + rustc ]; buildInputs = [ libxml2 pciutils - gtk2 + gtk3 ddccontrol-db ]; @@ -48,9 +59,10 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail \ "\$""{datadir}/ddccontrol-db" \ "${ddccontrol-db}/share/ddccontrol-db" - - substituteInPlace src/ddcpci/Makefile.am \ - --replace "chmod 4711" "chmod 0711" + substituteInPlace src/lib/Makefile.am \ + --replace-fail \ + 'DDCONTROL_DATADIR="$(datadir)/ddccontrol-db"' \ + 'DDCONTROL_DATADIR="${ddccontrol-db}/share/ddccontrol-db"' ''; preConfigure = ''