Merge pull request #264280 from wineee/dde-daemon

deepin.dde-daemon: fix build with ddcutil 2

authored by Michele Guerini Rocco and committed by GitHub 63982e51 3f224f06

+18
+17
pkgs/desktops/deepin/go-package/dde-daemon/0006-fix-build-with-ddcutil-2.patch
··· 1 + diff --git a/bin/backlight_helper/ddcci/ddcci.go b/bin/backlight_helper/ddcci/ddcci.go 2 + index 679beea3..ccbfc508 100644 3 + --- a/bin/backlight_helper/ddcci/ddcci.go 4 + +++ b/bin/backlight_helper/ddcci/ddcci.go 5 + @@ -103,11 +103,6 @@ func newDDCCI() (*ddcci, error) { 6 + displayHandleMap: make(map[string]*displayHandle), 7 + } 8 + 9 + - status := C.ddca_set_max_tries(C.DDCA_MULTI_PART_TRIES, 5) 10 + - if status < C.int(0) { 11 + - return nil, fmt.Errorf("brightness: Error setting retries: %d", status) 12 + - } 13 + - 14 + err := ddc.RefreshDisplays() 15 + if err != nil { 16 + return nil, err 17 +
+1
pkgs/desktops/deepin/go-package/dde-daemon/default.nix
··· 62 62 src = ./0005-fix-custom-wallpapers-path.diff; 63 63 inherit coreutils; 64 64 }) 65 + ./0006-fix-build-with-ddcutil-2.patch 65 66 ]; 66 67 67 68 postPatch = ''