diff options
author | Maciej Krüger <mkg20001@gmail.com> | 2021-11-29 17:34:50 +0100 |
---|---|---|
committer | Maciej Krüger <mkg20001@gmail.com> | 2021-11-29 17:34:50 +0100 |
commit | 8cbd56b6718d8d6562c7f74a9facabc2d125e5e5 (patch) | |
tree | 60a37ddf0f681d1212dbf7d3dc7966d11715063d | |
parent | e14fadd95ceb4d0b04e54a5e28cf0329a9e13c3a (diff) | |
download | nixpkgs-8cbd56b6718d8d6562c7f74a9facabc2d125e5e5.tar nixpkgs-8cbd56b6718d8d6562c7f74a9facabc2d125e5e5.tar.gz nixpkgs-8cbd56b6718d8d6562c7f74a9facabc2d125e5e5.tar.bz2 nixpkgs-8cbd56b6718d8d6562c7f74a9facabc2d125e5e5.tar.lz nixpkgs-8cbd56b6718d8d6562c7f74a9facabc2d125e5e5.tar.xz nixpkgs-8cbd56b6718d8d6562c7f74a9facabc2d125e5e5.tar.zst nixpkgs-8cbd56b6718d8d6562c7f74a9facabc2d125e5e5.zip |
cinnamon.*: apply nixpkgs-fmt
-rw-r--r-- | pkgs/desktops/cinnamon/bulky/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/default.nix | 5 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 7 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-desktop/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix | 20 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-menus/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-session/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/default.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/mint-themes/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/mint-x-icons/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/mint-y-icons/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/muffin/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/nemo/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/xapps/default.nix | 5 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/xviewer/default.nix | 3 |
16 files changed, 44 insertions, 31 deletions
diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index f7579f3e4c6..56cf5a0ff51 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -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 diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 0ce9c53c2fe..303443cc5f9 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -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; { diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index f516e481830..a105f39ac46 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -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 diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index 717f2633b9a..ec786c7bacb 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -8,7 +8,8 @@ , pkg-config , pulseaudio , python3 -, lib, stdenv +, lib +, stdenv , xkeyboard_config , xorg , wrapGAppsHook diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 6f54515569e..3066d7fcd80 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -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 '' diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index d143176f765..99008b4726e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -4,7 +4,8 @@ , meson , ninja , pkg-config -, lib, stdenv +, lib +, stdenv , wrapGAppsHook }: diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index ad4f079359f..3d84a6a0622 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , pkg-config , meson diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index a26580a5682..91c03796a88 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -15,7 +15,8 @@ , ninja , pkg-config , python3 -, lib, stdenv +, lib +, stdenv , systemd , wrapGAppsHook , xapps diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 00927b0fa91..7f9d332ed14 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -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 { }; diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index acdd293050d..f25cb9df2fd 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub -, lib, stdenv +, lib +, stdenv , python3 , sassc , sass diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index c0a82dd24a9..bfcc95c4ff9 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub -, lib, stdenv +, lib +, stdenv , gnome , gnome-icon-theme , hicolor-icon-theme diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index e400ab14ff1..c1afd2828d2 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub -, lib, stdenv +, lib +, stdenv , gnome , gnome-icon-theme , hicolor-icon-theme diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 6377737d6b0..6f35d6b5901 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -14,7 +14,8 @@ , libXtst , libxkbcommon , pkg-config -, lib, stdenv +, lib +, stdenv , udev , xorg , wrapGAppsHook diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index f931ac3158a..8baadab496e 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -5,7 +5,8 @@ , meson , ninja , pkg-config -, lib, stdenv +, lib +, stdenv , wrapGAppsHook , libxml2 , gtk3 diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapps/default.nix index 9e7654827b0..dfde8773ec0 100644 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ b/pkgs/desktops/cinnamon/xapps/default.nix @@ -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 ])) diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 6f68481b92d..42a4beb4f5e 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -21,7 +21,8 @@ , shared-mime-info , wrapGAppsHook , xapps -, yelp-tools }: +, yelp-tools +}: stdenv.mkDerivation rec { pname = "xviewer"; |