diff options
| author | Maciej Krüger <mkg20001@gmail.com> | 2021-02-06 14:44:50 +0100 |
|---|---|---|
| committer | Maciej Krüger <mkg20001@gmail.com> | 2021-04-19 14:46:23 +0200 |
| commit | 1795c727ec30974ffb9038f13e72aa9eb45b1485 (patch) | |
| tree | 483ca706e241d64b88f54ade9f1642eac518011e /pkgs/desktops | |
| parent | fd5331d9a6f912f55c2f60f16004d5f778276f7a (diff) | |
| download | nixpkgs-1795c727ec30974ffb9038f13e72aa9eb45b1485.tar nixpkgs-1795c727ec30974ffb9038f13e72aa9eb45b1485.tar.gz nixpkgs-1795c727ec30974ffb9038f13e72aa9eb45b1485.tar.bz2 nixpkgs-1795c727ec30974ffb9038f13e72aa9eb45b1485.tar.lz nixpkgs-1795c727ec30974ffb9038f13e72aa9eb45b1485.tar.xz nixpkgs-1795c727ec30974ffb9038f13e72aa9eb45b1485.tar.zst nixpkgs-1795c727ec30974ffb9038f13e72aa9eb45b1485.zip | |
cinnamon.cinnamon-control-center: 4.6.2 -> 4.8.2
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 4e951bfcc58..3a711fbece6 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -1,11 +1,9 @@ { lib, stdenv , fetchFromGitHub , pkg-config -, autoreconfHook , glib , gettext , cinnamon-desktop -, intltool , gtk3 , libnotify , libxml2 @@ -20,7 +18,7 @@ , libxklavier , networkmanager , libwacom -, libtool +, gnome3 , wrapGAppsHook , tzdata , glibc @@ -28,17 +26,19 @@ , modemmanager , xorg , gdk-pixbuf +, meson +, ninja }: stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "4.6.2"; + version = "4.8.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0fbgi2r2xikpa04k431qq9akngi9akyflq1kcks8f095qs5gsana"; + sha256 = "sha256-vALThDY0uN9bV7b1fga3MK7b2/l5uL33+B2x6oSLPRE="; }; buildInputs = [ @@ -70,16 +70,11 @@ stdenv.mkDerivation rec { ./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */ postPatch = '' - patchShebangs ./autogen.sh sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c sed 's|TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"|TZ_DATA_FILE "${tzdata}/share/zoneinfo/zone.tab"|g' -i ./panels/datetime/tz.h sed 's|"/usr/share/i18n/locales/"|"${glibc}/share/i18n/locales/"|g' -i panels/datetime/test-endianess.c ''; - autoreconfPhase = '' - NOCONFIGURE=1 bash ./autogen.sh - ''; - # it needs to have access to that file, otherwise we can't run tests after build preBuild = '' @@ -87,19 +82,23 @@ stdenv.mkDerivation rec { ln -s $PWD/panels/datetime $out/share/cinnamon-control-center/ ''; + mesonFlags = [ + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + ]; + preInstall = '' - rm -rfv $out + rm -r $out ''; - doCheck = true; + # the only test is wacom-calibrator and it seems to need an xserver and prob more services aswell + doCheck = false; nativeBuildInputs = [ pkg-config - autoreconfHook + meson + ninja wrapGAppsHook gettext - intltool - libtool ]; meta = with lib; { |