diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index dded4a9ff610..b3a16ed3fc35 100644 --- a/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -9,7 +9,6 @@ , libnotify , libxml2 , gnome-online-accounts -, cinnamon-settings-daemon , colord , polkit , libxkbfile @@ -36,13 +35,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "5.4.6"; + version = "5.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-8BDmQT/xDnpwR2YC0TGaqWPnZ61IBmVvft2Mcf6YN+A="; + hash = "sha256-rp3K7SqGw8da2U61VjKiqUyT5vCUVk4XZdRYtLwRtfQ="; }; buildInputs = [ @@ -56,7 +55,6 @@ stdenv.mkDerivation rec { libgnomekbd libxklavier colord - cinnamon-settings-daemon libgudev libwacom gnome-online-accounts @@ -82,27 +80,11 @@ stdenv.mkDerivation rec { patchShebangs meson_install_schemas.py ''; - # it needs to have access to that file, otherwise we can't run tests after build - - preBuild = '' - mkdir -p $out/share/cinnamon-control-center/ - ln -s $PWD/panels/datetime $out/share/cinnamon-control-center/ - ''; - mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; - preInstall = '' - rm -r $out - ''; - - # the only test is wacom-calibrator and it seems to need an xserver and prob more services aswell - doCheck = false; - nativeBuildInputs = [ pkg-config meson |