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: 21b6279c9fdf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a65f338ccbd6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 20, 2020

  1. cinnamon.cinnamon-desktop: init at 4.4.0

    @mkg20001
    mkg20001 committed Jan 20, 2020
    Copy the full SHA
    e105a95 View commit details

  2. Merge pull request #78060 from mkg20001/pkg/cinnamon-desktop 

    cinnamon.cinnamon-desktop: init at 4.4.0
    @worldofpeace
    worldofpeace authored Jan 20, 2020
    Copy the full SHA
    a65f338 View commit details
Showing with 77 additions and 0 deletions.
  1. +76 −0 pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
  2. +1 −0 pkgs/desktops/cinnamon/default.nix
76 changes: 76 additions & 0 deletions pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{ fetchFromGitHub
, gdk-pixbuf
, gobject-introspection
, gtk3
, intltool
, meson
, ninja
, pkgconfig
, pulseaudio
, python3
, stdenv
, xkeyboard_config
, xorg
, wrapGAppsHook
, glib
}:

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

src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "17hb8gkb9pfj56ckva5g4x83yvmdv7hvpidxjsdf79dw6pabr5rg";
};

outputs = [ "out" "dev" ];

propagatedBuildInputs = [
glib
gtk3
pulseaudio
];

buildInputs = [
gdk-pixbuf
xkeyboard_config
xorg.libxkbfile
xorg.libXext
xorg.libXrandr
gobject-introspection
];

nativeBuildInputs = [
meson
ninja
python3
wrapGAppsHook
intltool
pkgconfig
];

postPatch = ''
chmod +x install-scripts/meson_install_schemas.py # patchShebangs requires executable file
patchShebangs install-scripts/meson_install_schemas.py
sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon-common/share/cinnamon
'';

meta = with stdenv.lib; {
homepage = "https://github.com/linuxmint/cinnamon-desktop";
description = "Library and data for various Cinnamon modules";

longDescription = ''
The libcinnamon-desktop library provides API shared by several applications
on the desktop, but that cannot live in the platform for various
reasons. There is no API or ABI guarantee, although we are doing our
best to provide stability. Documentation for the API is available with
gtk-doc.
'';

platforms = platforms.linux;
maintainers = [ maintainers.mkg20001 ];
};
}
1 change: 1 addition & 0 deletions pkgs/desktops/cinnamon/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ pkgs, lib }:

lib.makeScope pkgs.newScope (self: with self; {
cinnamon-desktop = callPackage ./cinnamon-desktop { };
cjs = callPackage ./cjs { };
xapps = callPackage ./xapps { };
})