git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #148095 from rvl/update-ddccontrol

ddccontrol: 0.5.2 -> 0.6.0

commit7240c085d08229bc4c9b3614ac5bd4adf6259b2a authorJan Tojnar <jtojnar@gmail.com> dateThu 3 Feb 2022, 11:07 (5 years ago) parent31ca764d9b8919
2 files changed+17−7
compare with master
unifiedsplit
nixos/modules/services/hardware/ddccontrol.nix+3 pkgs/tools/misc/ddccontrol/default.nix+14−7
nixos/modules/services/hardware/ddccontrol.nix+3
@@ -20,6 +20,9 @@ in
2020 ###### implementation
2121
2222 config = lib.mkIf cfg.enable {
23+ # Load the i2c-dev module
24+ boot.kernelModules = [ "i2c_dev" ];
25+
2326 # Give users access to the "gddccontrol" tool
2427 environment.systemPackages = [
2528 pkgs.ddccontrol
pkgs/tools/misc/ddccontrol/default.nix+14−7
@@ -12,13 +12,13 @@
1212
1313stdenv.mkDerivation rec {
1414 pname = "ddccontrol";
15− version = "0.5.2";
15+ version = "0.6.0";
1616
1717 src = fetchFromGitHub {
1818 owner = "ddccontrol";
1919 repo = "ddccontrol";
20− rev = "0.5.2";
21− sha256 = "sha256-kul0sjbwbCwadvrccG3KwL/fKWACFUg74QGvgfWE4FQ=";
20+ rev = version;
21+ sha256 = "00pmnzvd4l3w6chzw41mrf1pd7lrcwi1n7320bnq20rn8hsnbnxk";
2222 };
2323
2424 nativeBuildInputs = [
@@ -39,10 +39,17 @@ stdenv.mkDerivation rec {
3939 ];
4040
4141 prePatch = ''
42− oldPath="\$""{datadir}/ddccontrol-db"
43− newPath="${ddccontrol-db}/share/ddccontrol-db"
44− sed -i -e "s|$oldPath|$newPath|" configure.ac
45− sed -i -e "s/chmod 4711/chmod 0711/" src/ddcpci/Makefile*
42+ substituteInPlace configure.ac \
43+ --replace \
44+ "\$""{datadir}/ddccontrol-db" \
45+ "${ddccontrol-db}/share/ddccontrol-db"
46+
47+ substituteInPlace src/ddcpci/Makefile.am \
48+ --replace "chmod 4711" "chmod 0711"
49+ '' + lib.optionalString (lib.versionAtLeast "0.6.0" version) ''
50+ # Upstream PR: https://github.com/ddccontrol/ddccontrol/pull/115
51+ substituteInPlace src/lib/Makefile.am \
52+ --replace "/etc/" "\$""{sysconfdir}/"
4653 '';
4754
4855 preConfigure = ''