nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

deepin.dde-daemon: 6.0.34 -> 6.0.43

Browse Source
This commit is contained in:
rewine 2024-07-31 21:08:10 +08:00
parent 1412026fca
commit 49343c03d6
3 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/desktops/deepin/go-package/dde-daemon/0003-aviod-use-hardcode-path.diff
View File

@ -90,27 +90,3 @@ index cda69a77..e394ae07 100644
cmd = exec.Command("runuser", "-u", "lightdm", "glxinfo") // runuser -u lightdm glxinfo
} else {
cmd = exec.Command("glxinfo")
diff --git a/system/power1/manager_lmt.go b/system/power1/manager_lmt.go
index 87556893..f67cb5b0 100644
--- a/system/power1/manager_lmt.go
+++ b/system/power1/manager_lmt.go
@@ -8,6 +8,7 @@ import (
"bufio"
"io/ioutil"
"os"
+ "os/exec"
"path/filepath"
"strings"
@@ -28,7 +29,7 @@ const (
const lowBatteryThreshold = 20.0
func isLaptopModeBinOk() bool {
- _, err := os.Stat(laptopModeBin)
+ _, err := exec.LookPath("laptop_mode")
return err == nil
}
--
2.40.1

17
pkgs/desktops/deepin/go-package/dde-daemon/0004-fix-build-with-ddcutil-2.patch
View File

@ -1,17 +0,0 @@
diff --git a/bin/backlight_helper/ddcci/ddcci.go b/bin/backlight_helper/ddcci/ddcci.go
index 679beea3..ccbfc508 100644
--- a/bin/backlight_helper/ddcci/ddcci.go
+++ b/bin/backlight_helper/ddcci/ddcci.go
@@ -103,11 +103,6 @@ func newDDCCI() (*ddcci, error) {
displayHandleMap: make(map[string]*displayHandle),
}
- status := C.ddca_set_max_tries(C.DDCA_MULTI_PART_TRIES, 5)
- if status < C.int(0) {
- return nil, fmt.Errorf("brightness: Error setting retries: %d", status)
- }
-
err := ddc.RefreshDisplays()
if err != nil {
return nil, err

7
pkgs/desktops/deepin/go-package/dde-daemon/default.nix
View File

@ -37,16 +37,16 @@
buildGoModule rec {
pname = "dde-daemon";
version = "6.0.34";
version = "6.0.43";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = version;
hash = "sha256-NIFgv6EUSnCqSdPttx6wrr7K1nRV/JIZJy9uS7uu0Sc=";
hash = "sha256-3BzFFlcNwNWNcysD3qRYfdyGaX7gW2XJZ4HzdGiK7jU=";
};
vendorHash = "sha256-F39QGxY0aD+hHWguHosSrSzcB/ahYbnFW9vVtS5oUnU=";
vendorHash = "sha256-3kUAaVXERqNZhBFytzVbWY6/a8M0jIkWrN+QHdWp1HU=";
patches = [
./0001-dont-set-PATH.diff
@ -58,7 +58,6 @@ buildGoModule rec {
src = ./0003-aviod-use-hardcode-path.diff;
inherit dbus;
})
./0004-fix-build-with-ddcutil-2.patch
];
postPatch = ''