diff options
Diffstat (limited to 'pkgs/desktops/cinnamon/cinnamon-common/default.nix')
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/default.nix | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 133f404ee9ed..87d500cf617b 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -35,7 +35,7 @@ , python3 , keybinder3 , cairo -, xapps +, xapp , upower , nemo , libnotify @@ -68,7 +68,20 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro requests ])) + (python3.withPackages (pp: with pp; [ + dbus-python + setproctitle + pygobject3 + pycairo + python3.pkgs.xapp # The scope prefix is required + pillow + pytz + tinycss2 + python-pam + pexpect + distro + requests + ])) atk cacert cinnamon-control-center @@ -99,7 +112,7 @@ stdenv.mkDerivation rec { gnome.caribou keybinder3 upower - xapps + xapp timezonemap nemo libnotify @@ -134,8 +147,8 @@ stdenv.mkDerivation rec { sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py - sed "s|/usr/bin/upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py - sed "s|upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|/usr/bin/upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings # this one really IS optional |