diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-05 09:32:31 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-05 09:32:31 +0100 |
| commit | 480416cc0d7e508b652c516af8d7342e3b1e59e3 (patch) | |
| tree | d64d990b0d7cc1f80dca687b48563bc71628b55e /nixpkgs/pkgs/desktops | |
| parent | 05f40ff2bfe9c68198664c38d65816f677ac7ed4 (diff) | |
| parent | fa804edfb7869c9fb230e174182a8a1a7e512c40 (diff) | |
| download | nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.gz nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.bz2 nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.lz nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.xz nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.tar.zst nixlib-480416cc0d7e508b652c516af8d7342e3b1e59e3.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs into HEAD
Conflicts: nixpkgs/pkgs/servers/pr-tracker/default.nix
Diffstat (limited to 'nixpkgs/pkgs/desktops')
3 files changed, 35 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/0006-fix-build-with-ddcutil-2.patch b/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/0006-fix-build-with-ddcutil-2.patch new file mode 100644 index 000000000000..76729d488b3c --- /dev/null +++ b/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/0006-fix-build-with-ddcutil-2.patch @@ -0,0 +1,17 @@ +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 + diff --git a/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index b9a1da5ca2e8..1309b6d3f483 100644 --- a/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -62,6 +62,7 @@ buildGoPackage rec { src = ./0005-fix-custom-wallpapers-path.diff; inherit coreutils; }) + ./0006-fix-build-with-ddcutil-2.patch ]; postPatch = '' diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix index 169efcb2c325..16e6fb320928 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/xfconf/default.nix @@ -1,4 +1,10 @@ -{ lib, mkXfceDerivation, libxfce4util, gobject-introspection, vala }: +{ lib +, mkXfceDerivation +, fetchpatch +, libxfce4util +, gobject-introspection +, vala +}: mkXfceDerivation { category = "xfce"; @@ -7,6 +13,16 @@ mkXfceDerivation { sha256 = "sha256-FVNkcwOS4feMocx3vYhuWNs1EkXDrM1FaKkMhIOuPHI="; + patches = [ + # fixes a segfault, can likely be removed with 4.18.3, + # see https://gitlab.xfce.org/xfce/xfconf/-/issues/35#note_81151 + (fetchpatch { + name = "cache-fix-uncached-value.patch"; + url = "https://gitlab.xfce.org/xfce/xfconf/-/commit/03f7ff961fd46c9141aba624a278e19de0bf3211.diff"; + hash = "sha256-n9Wvt7NfKMxs2AcjUWgs4vZgzLUG9jyEVTZxINko4h8="; + }) + ]; + nativeBuildInputs = [ gobject-introspection vala ]; buildInputs = [ libxfce4util ]; |