diff options
32 files changed, 249 insertions, 249 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 5007e297267..073ea45cbc9 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -48,12 +48,6 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ appstream desktop-file-utils @@ -95,6 +89,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Code editor designed for elementary OS"; homepage = "https://github.com/elementary/code"; diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 8a9256f2a61..b3e1753c5b3 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -42,12 +42,6 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ gettext meson @@ -74,6 +68,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "GitHub Issue Reporter designed for elementary OS"; homepage = "https://github.com/elementary/feedback"; diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index cceeeabf15f..0e48eb8afc2 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -58,12 +58,6 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ desktop-file-utils meson @@ -108,6 +102,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Music player and library designed for elementary OS"; homepage = "https://github.com/elementary/music"; diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index a065966ba1e..d93b158168f 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -32,12 +32,6 @@ stdenv.mkDerivation rec { sha256 = "0abpcawmmv5mgzk2i5n9rlairmjr2v9rg9b8c9g7xa085s496bi9"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ desktop-file-utils gettext @@ -66,6 +60,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { homepage = "https://github.com/elementary/sideload"; description = "Flatpak installer, designed for elementary OS"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index bcb7c39d17b..152026e17a2 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -40,12 +40,6 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ meson ninja @@ -61,6 +55,12 @@ stdenv.mkDerivation rec { wingpanel-indicator-a11y ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Universal Access Plug"; homepage = "https://github.com/elementary/switchboard-plug-a11y"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index d48704736b1..03964284ed7 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -29,11 +29,13 @@ stdenv.mkDerivation rec { sha256 = "0c075ac7iqz4hqbp2ph0cwyhiq0jn6c1g1jjfhygjbssv3vvd268"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; + patches = [ + # Use NixOS's default wallpaper + (substituteAll { + src = ./fix-background-path.patch; + default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; + }) + ]; nativeBuildInputs = [ meson @@ -53,13 +55,11 @@ stdenv.mkDerivation rec { switchboard ]; - patches = [ - # Use NixOS's default wallpaper - (substituteAll { - src = ./fix-background-path.patch; - default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; - }) - ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; meta = with lib; { description = "Switchboard About Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index d24b7550260..03fb7e9349b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -24,12 +24,6 @@ stdenv.mkDerivation rec { sha256 = "18izmzhqp6x5ivha9yl8gyz9adyrsylw7w5p0cwm1bndgqbi7yh5"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ meson ninja @@ -45,6 +39,12 @@ stdenv.mkDerivation rec { switchboard ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Applications Plug"; homepage = "https://github.com/elementary/switchboard-plug-applications"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 764845c0202..53dc200a434 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -35,12 +35,6 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ meson ninja @@ -57,6 +51,12 @@ stdenv.mkDerivation rec { wingpanel-indicator-bluetooth # settings schema ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Bluetooth Plug"; homepage = "https://github.com/elementary/switchboard-plug-bluetooth"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 09717a584ce..71bbda8edb1 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -27,12 +27,6 @@ stdenv.mkDerivation rec { sha256 = "10rqhxsqbl1xnz5n84d7m39c3vb71k153989xvyc55djia1wjx96"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - patches = [ (substituteAll { src = ./fix-paths.patch; @@ -61,6 +55,12 @@ stdenv.mkDerivation rec { switchboard ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Date & Time Plug"; homepage = "https://github.com/elementary/switchboard-plug-datetime"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index c25188add45..4a7ce6f6d46 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -24,12 +24,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-3sYZCazGnTjIi3Iry5673TMI13sD0GuY+46AK+NJH70="; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ meson ninja @@ -45,6 +39,12 @@ stdenv.mkDerivation rec { switchboard ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Displays Plug"; homepage = "https://github.com/elementary/switchboard-plug-display"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 01a3da26b1d..1118d52fb43 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -40,12 +40,6 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ libxml2 meson @@ -67,6 +61,12 @@ stdenv.mkDerivation rec { switchboard ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Keyboard Plug"; homepage = "https://github.com/elementary/switchboard-plug-keyboard"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index a765eca6de2..2c9b3833a0c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -29,11 +29,12 @@ stdenv.mkDerivation rec { sha256 = "0nqgbpk1knvbj5xa078i0ka6lzqmaaa873gwj3mhjr5q2gzkw7y5"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + touchegg = touchegg; + }) + ]; nativeBuildInputs = [ meson @@ -54,12 +55,11 @@ stdenv.mkDerivation rec { touchegg ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - touchegg = touchegg; - }) - ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; meta = with lib; { description = "Switchboard Mouse & Touchpad Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index b88f3f72d03..64a3083c6c2 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -27,11 +27,12 @@ stdenv.mkDerivation rec { sha256 = "0nqihsbrpjw4nx1c50g854bqybniw38adi78vzg8nyl6ikj2r0z4"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit networkmanagerapplet; + }) + ]; nativeBuildInputs = [ meson @@ -49,12 +50,11 @@ stdenv.mkDerivation rec { switchboard ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit networkmanagerapplet; - }) - ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; meta = with lib; { description = "Switchboard Networking Plug"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index fd5dfa32810..f142b8e9bb9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -34,12 +34,6 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ meson ninja @@ -55,6 +49,12 @@ stdenv.mkDerivation rec { switchboard ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Notifications Plug"; homepage = "https://github.com/elementary/switchboard-plug-notifications"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 16ed92b45d2..2a531815f87 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -28,12 +28,6 @@ stdenv.mkDerivation rec { sha256 = "006h8mrhmdrbd83vhdyahgrfk9wh6j9kjincpp7dz7sl8fsyhmcr"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ meson ninja @@ -53,6 +47,12 @@ stdenv.mkDerivation rec { wingpanel-indicator-power # settings schema ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Power Plug"; homepage = "https://github.com/elementary/switchboard-plug-power"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index dbca28038ab..40b52affa03 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -34,12 +34,6 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ meson ninja @@ -55,6 +49,12 @@ stdenv.mkDerivation rec { switchboard ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Printers Plug"; homepage = "https://github.com/elementary/switchboard-plug-printers"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index f41cfa2f745..2a480bb9e25 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -33,12 +33,6 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ meson ninja @@ -53,6 +47,12 @@ stdenv.mkDerivation rec { switchboard ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Sharing Plug"; homepage = "https://github.com/elementary/switchboard-plug-sharing"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix index e31768c764d..904278f983e 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix @@ -37,12 +37,6 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ meson ninja @@ -62,6 +56,12 @@ stdenv.mkDerivation rec { xorg.libXi ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Switchboard Wacom Plug"; homepage = "https://github.com/elementary/switchboard-plug-wacom"; diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 50a3317d6e0..209fa1202f3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -28,12 +28,6 @@ stdenv.mkDerivation rec { sha256 = "02dfsrfmr297cxpyd5m3746ihcgjyfnb3d42ng9m4ljdvh0dxgim"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ gettext meson @@ -73,6 +67,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Extensible System Settings app for Pantheon"; homepage = "https://github.com/elementary/switchboard"; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 72df609c5a4..e8f6638f105 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -40,16 +40,20 @@ stdenv.mkDerivation rec { sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - - xgreeters = linkFarm "pantheon-greeter-xgreeters" [{ - path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop"; - name = "io.elementary.greeter.desktop"; - }]; - }; + patches = [ + ./sysconfdir-install.patch + # Needed until https://github.com/elementary/greeter/issues/360 is fixed + (substituteAll { + src = ./hardcode-fallback-background.patch; + default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; + }) + # Fix build with meson 0.61 + # https://github.com/elementary/greeter/pull/590 + (fetchpatch { + url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch"; + sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY="; + }) + ]; nativeBuildInputs = [ desktop-file-utils @@ -84,21 +88,6 @@ stdenv.mkDerivation rec { "-Dgsd-dir=${gnome-settings-daemon}/libexec/" # trailing slash is needed ]; - patches = [ - ./sysconfdir-install.patch - # Needed until https://github.com/elementary/greeter/issues/360 is fixed - (substituteAll { - src = ./hardcode-fallback-background.patch; - default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"; - }) - # Fix build with meson 0.61 - # https://github.com/elementary/greeter/pull/590 - (fetchpatch { - url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch"; - sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY="; - }) - ]; - preFixup = '' gappsWrapperArgs+=( # dbus-launch needed in path @@ -125,6 +114,17 @@ stdenv.mkDerivation rec { --replace "Exec=io.elementary.greeter" "Exec=$out/bin/io.elementary.greeter" ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + + xgreeters = linkFarm "pantheon-greeter-xgreeters" [{ + path = "${elementary-greeter}/share/xgreeters/io.elementary.greeter.desktop"; + name = "io.elementary.greeter.desktop"; + }]; + }; + meta = with lib; { description = "LightDM Greeter for Pantheon"; homepage = "https://github.com/elementary/greeter"; 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 diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index 119d5be2138..a6d7040d432 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -22,12 +22,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-l2IUu9Mj22lZ5yajPcsGrJcJDakNu4srCV0Qea5ybPA="; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ meson ninja @@ -37,6 +31,12 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Simple shim for printing support via Contractor"; homepage = "https://github.com/elementary/print"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix index 7ffc2cebab7..eab86136c7d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix @@ -34,12 +34,6 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ meson ninja @@ -60,6 +54,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Universal Access Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-a11y"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 56d59ed4614..605b4b7709a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -27,12 +27,6 @@ stdenv.mkDerivation rec { sha256 = "12rasf8wy3cqnfjlm9s2qnx4drzx0w0yviagkng3kspdzm3vzsqy"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ glib # for glib-compile-schemas libxml2 @@ -57,6 +51,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Bluetooth Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-bluetooth"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 4ce8fb0434f..b36a95e8b20 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -29,11 +29,18 @@ stdenv.mkDerivation rec { sha256 = "10zzsil5l6snz47nx887r22sl2n0j6bg4dhxmgk3j3xp3jhgmrgl"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display"; + }) + # Upstream code not respecting our localedir + # https://github.com/elementary/wingpanel-indicator-keyboard/pull/110 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-keyboard/commit/ea5df2f62a99a216ee5ed137268e710490a852a4.patch"; + sha256 = "0fmdz10xgzsryj0f0dnpjrh9yygjkb91a7pxg0rwddxbprhnr7j0"; + }) + ]; nativeBuildInputs = [ meson @@ -52,18 +59,11 @@ stdenv.mkDerivation rec { xorg.xkeyboardconfig ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display"; - }) - # Upstream code not respecting our localedir - # https://github.com/elementary/wingpanel-indicator-keyboard/pull/110 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-keyboard/commit/ea5df2f62a99a216ee5ed137268e710490a852a4.patch"; - sha256 = "0fmdz10xgzsryj0f0dnpjrh9yygjkb91a7pxg0rwddxbprhnr7j0"; - }) - ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; meta = with lib; { description = "Keyboard Indicator for Wingpanel"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index ecaa05bc356..9261bccd518 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -34,12 +34,6 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ libxml2 meson @@ -55,6 +49,12 @@ stdenv.mkDerivation rec { wingpanel ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Night Light Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-nightlight"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 38a8fb23701..6c300536b2f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -30,11 +30,12 @@ stdenv.mkDerivation rec { sha256 = "1zlpnl7983jkpy2nik08ih8lwrqvm456h993ixa6armzlazdvnjk"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + gnome_power_manager = gnome.gnome-power-manager; + }) + ]; nativeBuildInputs = [ meson @@ -55,18 +56,17 @@ stdenv.mkDerivation rec { wingpanel ]; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - gnome_power_manager = gnome.gnome-power-manager; - }) - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Power Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-power"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index 510558f3cb6..41039ff686e 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -35,12 +35,6 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ meson ninja @@ -57,6 +51,12 @@ stdenv.mkDerivation rec { wingpanel ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Session Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-session"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 0cd7a13c3e1..2e3f51b4a6a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-WvkQx+9YjKCINpyVg8KjCV0GAb0rJfblSFaO14/4oas="; }; + patches = [ + ./indicators.patch + ]; + nativeBuildInputs = [ gettext meson @@ -53,10 +57,6 @@ stdenv.mkDerivation rec { mesa # for libEGL ]; - patches = [ - ./indicators.patch - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index a6c0cb8a3c5..ba00be72e27 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -25,12 +25,6 @@ stdenv.mkDerivation rec { sha256 = "1sqww7zlzl086pjww3d21ah1g78lfrc9aagrqhmsnnbji9gwb8ab"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ dbus meson @@ -49,6 +43,12 @@ stdenv.mkDerivation rec { PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder "out"}/share/dbus-1/services"; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "A desktop-wide extension service used by elementary OS"; homepage = "https://github.com/elementary/contractor"; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index c135ea4e18e..005ae0a461b 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -25,12 +25,6 @@ stdenv.mkDerivation rec { sha256 = "0hx3sky0vd2vshkscy3w5x3s18gd45cfqh510xhbmvc0sa32q9gd"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ desktop-file-utils meson @@ -51,6 +45,12 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Pantheon Geoclue2 Agent"; homepage = "https://github.com/elementary/pantheon-agent-geoclue2"; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 3644d9665df..b009954bc84 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -24,12 +24,6 @@ stdenv.mkDerivation rec { sha256 = "1acqjjarl225yk0f68wkldsamcrzrj0ibpcxma04wq9w7jlmz60c"; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - nativeBuildInputs = [ meson ninja @@ -45,6 +39,12 @@ stdenv.mkDerivation rec { polkit ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Polkit Agent for the Pantheon Desktop"; homepage = "https://github.com/elementary/pantheon-agent-polkit"; |