JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #147844 from mkg20001/cin

Browse Source
This commit is contained in:
Maciej Krüger 2021-11-30 19:18:14 +01:00 committed by GitHub
commit aae62adc6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/cinnamon/bulky/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
(python3.withPackages(p: with p; [ pygobject3 magic setproctitle ]))
(python3.withPackages (p: with p; [ pygobject3 magic setproctitle ]))
gsettings-desktop-schemas
gtk3
glib

5
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View File

@ -25,7 +25,8 @@
, networkmanager
, pkg-config
, polkit
, lib, stdenv
, lib
, stdenv
, wrapGAppsHook
, libxml2
, gtk-doc
@ -153,7 +154,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
providedSessions = ["cinnamon" "cinnamon2d"];
providedSessions = [ "cinnamon" "cinnamon2d" ];
};
meta = with lib; {

7
pkgs/desktops/cinnamon/cinnamon-control-center/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, glib
@ -68,8 +69,8 @@ stdenv.mkDerivation rec {
];
/* ./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" */
./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 = ''
sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c

3
pkgs/desktops/cinnamon/cinnamon-desktop/default.nix
View File

@ -8,7 +8,8 @@
, pkg-config
, pulseaudio
, python3
, lib, stdenv
, lib
, stdenv
, xkeyboard_config
, xorg
, wrapGAppsHook

20
pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix
View File

@ -5,7 +5,7 @@
, gtk3
, gsettings-desktop-schemas
, extraGSettingsOverrides ? ""
, extraGSettingsOverridePackages ? []
, extraGSettingsOverridePackages ? [ ]
, mint-artwork
, muffin
@ -41,19 +41,19 @@ in
with lib;
# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this
runCommand "cinnamon-gsettings-overrides" {}
runCommand "cinnamon-gsettings-overrides" { }
''
schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
mkdir -p $schema_dir
mkdir -p $schema_dir
${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml ${glib.getSchemaPath pkg}/*.gschema.override $schema_dir\n") gsettingsOverridePackages}
${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml ${glib.getSchemaPath pkg}/*.gschema.override $schema_dir\n") gsettingsOverridePackages}
chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF
${extraGSettingsOverrides}
EOF
cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF
${extraGSettingsOverrides}
EOF
${glib.dev}/bin/glib-compile-schemas $schema_dir
${glib.dev}/bin/glib-compile-schemas $schema_dir
''

3
pkgs/desktops/cinnamon/cinnamon-menus/default.nix
View File

@ -4,7 +4,8 @@
, meson
, ninja
, pkg-config
, lib, stdenv
, lib
, stdenv
, wrapGAppsHook
}:

3
pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, meson

3
pkgs/desktops/cinnamon/cinnamon-session/default.nix
View File

@ -15,7 +15,8 @@
, ninja
, pkg-config
, python3
, lib, stdenv
, lib
, stdenv
, systemd
, wrapGAppsHook
, xapps

6
pkgs/desktops/cinnamon/default.nix
View File

@ -1,19 +1,19 @@
{ pkgs, lib }:
lib.makeScope pkgs.newScope (self: with self; {
iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs(p: p // {
iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs (p: p // {
buildPhase = "make png-country-320x240-fancy";
# installPhase = "mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png-320x420";
installPhase = "mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png";
});
iso-flags-svg = pkgs.iso-flags.overrideAttrs(p: p // {
iso-flags-svg = pkgs.iso-flags.overrideAttrs (p: p // {
buildPhase = "mkdir -p $out/share";
installPhase = "mv svg $out/share/iso-flags-svg";
});
# blueberry -> pkgs/tools/bluetooth/blueberry/default.nix
bulky = callPackage ./bulky {};
bulky = callPackage ./bulky { };
cinnamon-common = callPackage ./cinnamon-common { };
cinnamon-control-center = callPackage ./cinnamon-control-center { };
cinnamon-desktop = callPackage ./cinnamon-desktop { };

3
pkgs/desktops/cinnamon/mint-themes/default.nix
View File

@ -1,5 +1,6 @@
{ fetchFromGitHub
, lib, stdenv
, lib
, stdenv
, python3
, sassc
, sass

3
pkgs/desktops/cinnamon/mint-x-icons/default.nix
View File

@ -1,5 +1,6 @@
{ fetchFromGitHub
, lib, stdenv
, lib
, stdenv
, gnome
, gnome-icon-theme
, hicolor-icon-theme

3
pkgs/desktops/cinnamon/mint-y-icons/default.nix
View File

@ -1,5 +1,6 @@
{ fetchFromGitHub
, lib, stdenv
, lib
, stdenv
, gnome
, gnome-icon-theme
, hicolor-icon-theme

3
pkgs/desktops/cinnamon/muffin/default.nix
View File

@ -14,7 +14,8 @@
, libXtst
, libxkbcommon
, pkg-config
, lib, stdenv
, lib
, stdenv
, udev
, xorg
, wrapGAppsHook

3
pkgs/desktops/cinnamon/nemo/default.nix
View File

@ -5,7 +5,8 @@
, meson
, ninja
, pkg-config
, lib, stdenv
, lib
, stdenv
, wrapGAppsHook
, libxml2
, gtk3

5
pkgs/desktops/cinnamon/xapps/default.nix
View File

@ -10,7 +10,8 @@
, ninja
, pkg-config
, python3
, lib, stdenv
, lib
, stdenv
, vala
, wrapGAppsHook
, inxi
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gobject-introspection
(python3.withPackages(ps: with ps; [
(python3.withPackages (ps: with ps; [
pygobject3
setproctitle # mate applet
]))

3
pkgs/desktops/cinnamon/xviewer/default.nix
View File

@ -21,7 +21,8 @@
, shared-mime-info
, wrapGAppsHook
, xapps
, yelp-tools }:
, yelp-tools
}:
stdenv.mkDerivation rec {
pname = "xviewer";