mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 04:43:09 +03:00
new package: muffin
This commit is contained in:
parent
85992ec738
commit
a6a90cad1b
41
pkgs/desktops/cinnamon/gtkdoc.patch
Normal file
41
pkgs/desktops/cinnamon/gtkdoc.patch
Normal file
@ -0,0 +1,41 @@
|
||||
--- a/src/meta/prefs.h
|
||||
+++ b/src/meta/prefs.h
|
||||
@@ -310,13 +310,13 @@ typedef struct
|
||||
*/
|
||||
GSList *bindings;
|
||||
|
||||
- /** for keybindings that can have shift or not like Alt+Tab */
|
||||
+ /* for keybindings that can have shift or not like Alt+Tab */
|
||||
gboolean add_shift:1;
|
||||
|
||||
- /** for keybindings that apply only to a window */
|
||||
+ /* for keybindings that apply only to a window */
|
||||
gboolean per_window:1;
|
||||
|
||||
- /** for keybindings not added with meta_display_add_keybinding() */
|
||||
+ /* for keybindings not added with meta_display_add_keybinding() */
|
||||
gboolean builtin:1;
|
||||
} MetaKeyPref;
|
||||
|
||||
@@ -339,5 +339,3 @@ CDesktopVisualBellType meta_prefs_get_vi
|
||||
MetaPlacementMode meta_prefs_get_placement_mode (void);
|
||||
|
||||
#endif
|
||||
-
|
||||
-
|
||||
--- a/src/core/workspace.c
|
||||
+++ b/src/core/workspace.c
|
||||
@@ -194,7 +194,7 @@ meta_workspace_new (MetaScreen *screen)
|
||||
return workspace;
|
||||
}
|
||||
|
||||
-/** Foreach function for workspace_free_struts() */
|
||||
+/* Foreach function for workspace_free_struts() */
|
||||
static void
|
||||
free_this (gpointer candidate, gpointer dummy)
|
||||
{
|
||||
@@ -1390,4 +1390,3 @@ meta_workspace_get_screen (MetaWorkspace
|
||||
{
|
||||
return workspace->screen;
|
||||
}
|
||||
-
|
46
pkgs/desktops/cinnamon/muffin.nix
Normal file
46
pkgs/desktops/cinnamon/muffin.nix
Normal file
@ -0,0 +1,46 @@
|
||||
|
||||
{ stdenv, fetchurl, pkgconfig, autoreconfHook, glib, gettext, gnome_common, gtk3,intltool,
|
||||
cinnamon-desktop, clutter, cogl, zenity, python, gnome_doc_utils, makeWrapper}:
|
||||
|
||||
let
|
||||
version = "2.0.5";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "muffin-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://github.com/linuxmint/muffin/archive/${version}.tar.gz";
|
||||
sha256 = "1vn7shxwyxsa6dd3zldrnc0095i1y0rq0944n8kak3m85r2pv9c1";
|
||||
};
|
||||
|
||||
|
||||
configureFlags = "--enable-compile-warnings=minium" ;
|
||||
|
||||
patches = [./gtkdoc.patch];
|
||||
|
||||
buildInputs = [
|
||||
pkgconfig autoreconfHook
|
||||
glib gettext gnome_common
|
||||
gtk3 intltool cinnamon-desktop
|
||||
clutter cogl zenity python
|
||||
gnome_doc_utils makeWrapper];
|
||||
|
||||
preBuild = "patchShebangs ./scripts";
|
||||
|
||||
|
||||
postFixup = ''
|
||||
|
||||
for f in "$out"/bin/*; do
|
||||
wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "http://cinnamon.linuxmint.com";
|
||||
description = "The cinnamon session files" ;
|
||||
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
maintainers = [ stdenv.lib.maintainers.roelof ];
|
||||
};
|
||||
}
|
||||
|
@ -9889,7 +9889,9 @@ let
|
||||
|
||||
cinnamon = recurseIntoAttrs rec {
|
||||
callPackage = newScope pkgs.cinnamon;
|
||||
inherit (gnome3) gnome_common libgnomekbd gnome-menus;
|
||||
inherit (gnome3) gnome_common libgnomekbd gnome-menus zenity;
|
||||
|
||||
muffin = callPackage ../desktops/cinnamon/muffin.nix { } ;
|
||||
|
||||
cinnamon-control-center = callPackage ../desktops/cinnamon/cinnamon-control-center.nix{ };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user