diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix')
-rw-r--r-- | nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 3d84a6a0622c..5f0ace4ad1ee 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -21,20 +21,21 @@ , pam , accountsservice , cairo -, xapps +, xapp +, xdotool , xorg , iso-flags-png-320x420 }: stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "5.2.0"; + version = "5.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-weQ5sw5SY89JFIxamCeLiSLy8xCXGg0Yxj/5Ca5r+6o="; + hash = "sha256-GRa3ChUCL/AFDg1F01DNwkC4tmrNaOWoOXwFvwpvSck="; }; nativeBuildInputs = [ @@ -60,8 +61,14 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXrandr - (python3.withPackages (pp: with pp; [ pygobject3 setproctitle xapp pycairo ])) - xapps + (python3.withPackages (pp: with pp; [ + pygobject3 + setproctitle + python3.pkgs.xapp # The scope prefix is required + pycairo + ])) + xapp + xdotool pam accountsservice cairo @@ -74,11 +81,6 @@ stdenv.mkDerivation rec { iso-flags-png-320x420 ]; - mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" - ]; - postPatch = '' # cscreensaver hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ |