b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

cinnamon.cinnamon-control-center: 4.6.2 -> 4.8.2

Browse source
This commit is contained in:
Maciej Krüger 2021-02-06 14:44:50 +01:00
parent fd5331d9a6
commit 1795c727ec
No known key found for this signature in database
GPG key ID: 0D948CE19CF49C5F
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
View file

@ -1,11 +1,9 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, pkg-config , pkg-config
, autoreconfHook
, glib , glib
, gettext , gettext
, cinnamon-desktop , cinnamon-desktop
, intltool
, gtk3 , gtk3
, libnotify , libnotify
, libxml2 , libxml2
@ -20,7 +18,7 @@
, libxklavier , libxklavier
, networkmanager , networkmanager
, libwacom , libwacom
, libtool , gnome3
, wrapGAppsHook , wrapGAppsHook
, tzdata , tzdata
, glibc , glibc
@ -28,17 +26,19 @@
, modemmanager , modemmanager
, xorg , xorg
, gdk-pixbuf , gdk-pixbuf
, meson
, ninja
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cinnamon-control-center"; pname = "cinnamon-control-center";
version = "4.6.2"; version = "4.8.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0fbgi2r2xikpa04k431qq9akngi9akyflq1kcks8f095qs5gsana"; sha256 = "sha256-vALThDY0uN9bV7b1fga3MK7b2/l5uL33+B2x6oSLPRE=";
}; };
buildInputs = [ 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" */ ./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */
postPatch = '' 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_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|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 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 # it needs to have access to that file, otherwise we can't run tests after build
preBuild = '' preBuild = ''
@ -87,19 +82,23 @@ stdenv.mkDerivation rec {
ln -s $PWD/panels/datetime $out/share/cinnamon-control-center/ ln -s $PWD/panels/datetime $out/share/cinnamon-control-center/
''; '';
mesonFlags = [
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
];
preInstall = '' 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 = [ nativeBuildInputs = [
pkg-config pkg-config
autoreconfHook meson
ninja
wrapGAppsHook wrapGAppsHook
gettext gettext
intltool
libtool
]; ];
meta = with lib; { meta = with lib; {