git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #147844 from mkg20001/cin
commitaae62adc6e429e6846cc9720e3d283240f98d3be authorMaciej Krüger <mkg20001@gmail.com> dateTue 30 Nov 2021, 19:18 (5 years ago) parent5cf3e3a8cbd56b
16 files changed+44−31
compare with master
unifiedsplit
pkgs/desktops/cinnamon/bulky/default.nix+1−1 pkgs/desktops/cinnamon/cinnamon-common/default.nix+3−2 pkgs/desktops/cinnamon/cinnamon-control-center/default.nix+4−3 pkgs/desktops/cinnamon/cinnamon-desktop/default.nix+2−1 pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix+10−10 pkgs/desktops/cinnamon/cinnamon-menus/default.nix+2−1 pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix+2−1 pkgs/desktops/cinnamon/cinnamon-session/default.nix+2−1 pkgs/desktops/cinnamon/default.nix+3−3 pkgs/desktops/cinnamon/mint-themes/default.nix+2−1 pkgs/desktops/cinnamon/mint-x-icons/default.nix+2−1 pkgs/desktops/cinnamon/mint-y-icons/default.nix+2−1 pkgs/desktops/cinnamon/muffin/default.nix+2−1 pkgs/desktops/cinnamon/nemo/default.nix+2−1 pkgs/desktops/cinnamon/xapps/default.nix+3−2 pkgs/desktops/cinnamon/xviewer/default.nix+2−1
pkgs/desktops/cinnamon/bulky/default.nix+1−1
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
2828 ];
2929
3030 buildInputs = [
31− (python3.withPackages(p: with p; [ pygobject3 magic setproctitle ]))
31+ (python3.withPackages (p: with p; [ pygobject3 magic setproctitle ]))
3232 gsettings-desktop-schemas
3333 gtk3
3434 glib
pkgs/desktops/cinnamon/cinnamon-common/default.nix+3−2
@@ -25,7 +25,8 @@
2525, networkmanager
2626, pkg-config
2727, polkit
28−, lib, stdenv
28+, lib
29+, stdenv
2930, wrapGAppsHook
3031, libxml2
3132, gtk-doc
@@ -153,7 +154,7 @@ stdenv.mkDerivation rec {
153154 '';
154155
155156 passthru = {
156− providedSessions = ["cinnamon" "cinnamon2d"];
157+ providedSessions = [ "cinnamon" "cinnamon2d" ];
157158 };
158159
159160 meta = with lib; {
pkgs/desktops/cinnamon/cinnamon-control-center/default.nix+4−3
@@ -1,4 +1,5 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchFromGitHub
34, pkg-config
45, glib
@@ -68,8 +69,8 @@ stdenv.mkDerivation rec {
6869 ];
6970
7071 /* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/"
71− ./panels/datetime/tz.h:32:# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
72− ./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */
72+ ./panels/datetime/tz.h:32:# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
73+ ./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */
7374
7475 postPatch = ''
7576 sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c
pkgs/desktops/cinnamon/cinnamon-desktop/default.nix+2−1
@@ -8,7 +8,8 @@
88, pkg-config
99, pulseaudio
1010, python3
11−, lib, stdenv
11+, lib
12+, stdenv
1213, xkeyboard_config
1314, xorg
1415, wrapGAppsHook
pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix+10−10
@@ -5,7 +5,7 @@
55, gtk3
66, gsettings-desktop-schemas
77, extraGSettingsOverrides ? ""
8−, extraGSettingsOverridePackages ? []
8+, extraGSettingsOverridePackages ? [ ]
99, mint-artwork
1010
1111, muffin
@@ -41,19 +41,19 @@ in
4141with lib;
4242
4343# TODO: Having https://github.com/NixOS/nixpkgs/issues/54150 would supersede this
44−runCommand "cinnamon-gsettings-overrides" {}
44+runCommand "cinnamon-gsettings-overrides" { }
4545 ''
46− schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
46+ schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
4747
48− mkdir -p $schema_dir
48+ mkdir -p $schema_dir
4949
50− ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml ${glib.getSchemaPath pkg}/*.gschema.override $schema_dir\n") gsettingsOverridePackages}
50+ ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml ${glib.getSchemaPath pkg}/*.gschema.override $schema_dir\n") gsettingsOverridePackages}
5151
52− chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
52+ chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
5353
54− cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF
55− ${extraGSettingsOverrides}
56− EOF
54+ cat - > $schema_dir/nixos-defaults.gschema.override <<- EOF
55+ ${extraGSettingsOverrides}
56+ EOF
5757
58− ${glib.dev}/bin/glib-compile-schemas $schema_dir
58+ ${glib.dev}/bin/glib-compile-schemas $schema_dir
5959 ''
pkgs/desktops/cinnamon/cinnamon-menus/default.nix+2−1
@@ -4,7 +4,8 @@
44, meson
55, ninja
66, pkg-config
7−, lib, stdenv
7+, lib
8+, stdenv
89, wrapGAppsHook
910}:
1011
pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix+2−1
@@ -1,4 +1,5 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchFromGitHub
34, pkg-config
45, meson
pkgs/desktops/cinnamon/cinnamon-session/default.nix+2−1
@@ -15,7 +15,8 @@
1515, ninja
1616, pkg-config
1717, python3
18−, lib, stdenv
18+, lib
19+, stdenv
1920, systemd
2021, wrapGAppsHook
2122, xapps
pkgs/desktops/cinnamon/default.nix+3−3
@@ -1,19 +1,19 @@
11{ pkgs, lib }:
22
33lib.makeScope pkgs.newScope (self: with self; {
4− iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs(p: p // {
4+ iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs (p: p // {
55 buildPhase = "make png-country-320x240-fancy";
66 # installPhase = "mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png-320x420";
77 installPhase = "mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png";
88 });
99
10− iso-flags-svg = pkgs.iso-flags.overrideAttrs(p: p // {
10+ iso-flags-svg = pkgs.iso-flags.overrideAttrs (p: p // {
1111 buildPhase = "mkdir -p $out/share";
1212 installPhase = "mv svg $out/share/iso-flags-svg";
1313 });
1414
1515 # blueberry -> pkgs/tools/bluetooth/blueberry/default.nix
16− bulky = callPackage ./bulky {};
16+ bulky = callPackage ./bulky { };
1717 cinnamon-common = callPackage ./cinnamon-common { };
1818 cinnamon-control-center = callPackage ./cinnamon-control-center { };
1919 cinnamon-desktop = callPackage ./cinnamon-desktop { };
pkgs/desktops/cinnamon/mint-themes/default.nix+2−1
@@ -1,5 +1,6 @@
11{ fetchFromGitHub
2−, lib, stdenv
2+, lib
3+, stdenv
34, python3
45, sassc
56, sass
pkgs/desktops/cinnamon/mint-x-icons/default.nix+2−1
@@ -1,5 +1,6 @@
11{ fetchFromGitHub
2−, lib, stdenv
2+, lib
3+, stdenv
34, gnome
45, gnome-icon-theme
56, hicolor-icon-theme
pkgs/desktops/cinnamon/mint-y-icons/default.nix+2−1
@@ -1,5 +1,6 @@
11{ fetchFromGitHub
2−, lib, stdenv
2+, lib
3+, stdenv
34, gnome
45, gnome-icon-theme
56, hicolor-icon-theme
pkgs/desktops/cinnamon/muffin/default.nix+2−1
@@ -14,7 +14,8 @@
1414, libXtst
1515, libxkbcommon
1616, pkg-config
17−, lib, stdenv
17+, lib
18+, stdenv
1819, udev
1920, xorg
2021, wrapGAppsHook
pkgs/desktops/cinnamon/nemo/default.nix+2−1
@@ -5,7 +5,8 @@
55, meson
66, ninja
77, pkg-config
8−, lib, stdenv
8+, lib
9+, stdenv
910, wrapGAppsHook
1011, libxml2
1112, gtk3
pkgs/desktops/cinnamon/xapps/default.nix+3−2
@@ -10,7 +10,8 @@
1010, ninja
1111, pkg-config
1212, python3
13−, lib, stdenv
13+, lib
14+, stdenv
1415, vala
1516, wrapGAppsHook
1617, inxi
@@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
4849
4950 buildInputs = [
5051 gobject-introspection
51− (python3.withPackages(ps: with ps; [
52+ (python3.withPackages (ps: with ps; [
5253 pygobject3
5354 setproctitle # mate applet
5455 ]))
pkgs/desktops/cinnamon/xviewer/default.nix+2−1
@@ -21,7 +21,8 @@
2121, shared-mime-info
2222, wrapGAppsHook
2323, xapps
24−, yelp-tools }:
24+, yelp-tools
25+}:
2526
2627stdenv.mkDerivation rec {
2728 pname = "xviewer";