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

Commits on Jan 21, 2020

  1. Copy the full SHA
    3a06e5f View commit details
  2. Merge pull request #78121 from mkg20001/pkg/cinnamon-menus

    cinnamon.cinnamon-menus: init at 4.4.0
    worldofpeace authored Jan 21, 2020
    Copy the full SHA
    66eca6f View commit details
Showing with 41 additions and 0 deletions.
  1. +40 −0 pkgs/desktops/cinnamon/cinnamon-menus/default.nix
  2. +1 −0 pkgs/desktops/cinnamon/default.nix
40 changes: 40 additions & 0 deletions pkgs/desktops/cinnamon/cinnamon-menus/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{ fetchFromGitHub
, glib
, gobject-introspection
, meson
, ninja
, pkgconfig
, stdenv
, wrapGAppsHook
}:

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

src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "0q4qj28swi2y93fj7pfil68l2cf9gmhbk6jmr8d70l54xf7sigsh";
};

buildInputs = [
glib
gobject-introspection
];

nativeBuildInputs = [
meson
ninja
wrapGAppsHook
pkgconfig
];

meta = with stdenv.lib; {
homepage = "https://github.com/linuxmint/cinnamon-menus";
description = "A menu system for the Cinnamon project";
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
@@ -2,6 +2,7 @@

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