From fae325457a0f53a6aa026ed5fd61c99a062c56d5 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 19 Jan 2022 22:53:31 +0800 Subject: pkgs/pantheon: reorder attributes https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/attribute-ordering.md Addressing the formatting now to minimize the Pantheon 7 update PR diff. --- .../desktop/elementary-onboarding/default.nix | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix') diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index e7a3d10b4fd..8781cd4a4f5 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -35,6 +35,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-9voy9eje3VlV4IMM664EyjKWTfSVogX5JoRCqhsUXTE="; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + appcenter = appcenter; + }) + # Provides the directory where the locales are actually installed + # https://github.com/elementary/onboarding/pull/147 + (fetchpatch { + url = "https://github.com/elementary/onboarding/commit/af19c3dbefd1c0e0ec18eddacc1f21cb991f5513.patch"; + sha256 = "sha256-fSFfjSd33W7rXXEUHY8b3rv9B9c31XfCjxjRxBBrqjs="; + }) + ]; + nativeBuildInputs = [ gettext meson @@ -56,19 +69,6 @@ stdenv.mkDerivation rec { libhandy ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - appcenter = appcenter; - }) - # Provides the directory where the locales are actually installed - # https://github.com/elementary/onboarding/pull/147 - (fetchpatch { - url = "https://github.com/elementary/onboarding/commit/af19c3dbefd1c0e0ec18eddacc1f21cb991f5513.patch"; - sha256 = "sha256-fSFfjSd33W7rXXEUHY8b3rv9B9c31XfCjxjRxBBrqjs="; - }) - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py -- cgit 1.4.1