Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 274d02e4776d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: af9bb2af8f01
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 25, 2020

  1. Copy the full SHA
    741b284 View commit details

Commits on Jan 29, 2020

  1. Merge pull request #78328 from mkg20001/pkg/cinnamon-control-center

    cinnamon.cinnamon-control-center: init at 4.4.0
    worldofpeace authored Jan 29, 2020
    Copy the full SHA
    af9bb2a View commit details
Showing with 125 additions and 0 deletions.
  1. +124 −0 pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
  2. +1 −0 pkgs/desktops/cinnamon/default.nix
124 changes: 124 additions & 0 deletions pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
{ stdenv
, fetchFromGitHub
, pkgconfig
, autoreconfHook
, glib
, gettext
, cinnamon-desktop
, intltool
, libxslt
, gtk3
, libnotify
, gnome-menus
, libxml2
, systemd
, upower
, cinnamon-settings-daemon
, colord
, polkit
, ibus
, libpulseaudio
, isocodes
, kerberos
, libxkbfile
, cinnamon-menus
, dbus-glib
, libgnomekbd
, libxklavier
, networkmanager
, libwacom
, gnome3
, libtool
, wrapGAppsHook
, tzdata
, glibc
, networkmanagerapplet
, modemmanager
, xorg
, gdk-pixbuf
, cups
}:

stdenv.mkDerivation rec {
pname = "cinnamon-control-center";
version = "4.4.0";

src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "1rxm5n2prh182rxvjs7psxgjddikrjr8492j22060gmyvq55n7kc";
};

configureFlags = [ "--enable-systemd" ];

buildInputs = [
gtk3
glib
cinnamon-desktop
libnotify
cinnamon-menus
libxml2
dbus-glib
systemd
polkit
libgnomekbd
libxklavier
colord
cinnamon-settings-daemon
libwacom
gnome3.gnome-online-accounts
tzdata
networkmanager
networkmanagerapplet
modemmanager
xorg.libXxf86misc
xorg.libxkbfile
gdk-pixbuf
cups
];

/* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/"
./panels/datetime/tz.h:32:# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
./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 = ''
mkdir -p $out/share/cinnamon-control-center/
ln -s $PWD/panels/datetime $out/share/cinnamon-control-center/
'';

preInstall = ''
rm -rfv $out
'';

nativeBuildInputs = [
pkgconfig
autoreconfHook
wrapGAppsHook
gettext
intltool
libxslt
libtool
];

meta = with stdenv.lib; {
homepage = "https://github.com/linuxmint/cinnamon-control-center";
description = "A collection of configuration plugins used in cinnamon-settings";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.mkg20001 ];
};
}
1 change: 1 addition & 0 deletions pkgs/desktops/cinnamon/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ pkgs, lib }:

lib.makeScope pkgs.newScope (self: with self; {
cinnamon-control-center = callPackage ./cinnamon-control-center { };
cinnamon-desktop = callPackage ./cinnamon-desktop { };
cinnamon-menus = callPackage ./cinnamon-menus { };
cinnamon-translations = callPackage ./cinnamon-translations { };