diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 4a4850a0824e5..bcbe50e5de35a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -1,25 +1,38 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig -, meson, ninja, vala, desktop-file-utils, libxml2 -, gtk3, python3, granite, libgee, elementary-icon-theme -, appstream, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, desktop-file-utils +, libxml2 +, gtk3 +, python3 +, granite +, libgee +, elementary-icon-theme +, appstream +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "calculator"; + pname = "elementary-calculator"; version = "1.5.2"; - name = "elementary-${pname}-${version}"; + repoName = "calculator"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1vdgl89hdf9q1ya6as7310hlr0xls3w7js2gzsd9z8arb6037ccl"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 9f684c22767d5..b806c085f8446 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -1,26 +1,45 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson -, ninja, vala, desktop-file-utils, gtk3, granite, libgee -, geoclue2, libchamplain, clutter, folks, geocode-glib, python3 -, libnotify, libical, evolution-data-server, appstream-glib -, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, desktop-file-utils +, gtk3 +, granite +, libgee +, geoclue2 +, libchamplain +, clutter +, folks +, geocode-glib +, python3 +, libnotify +, libical +, evolution-data-server +, appstream-glib +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "calendar"; + pname = "elementary-calendar"; version = "5.0"; - name = "elementary-${pname}-${version}"; + repoName = "calendar"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0yiis5ig98gjw4s2qh8lppkdmv1cgi6qchxqncsjdki7yxyyni35"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 90f326fb82691..279e9eff87ac1 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -1,24 +1,43 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala -, desktop-file-utils, python3, gettext, libxml2, gtk3, granite, libgee, gst_all_1 -, libcanberra, clutter-gtk, clutter-gst, elementary-icon-theme, appstream, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, desktop-file-utils +, python3 +, gettext +, libxml2 +, gtk3 +, granite +, libgee +, gst_all_1 +, libcanberra +, clutter-gtk +, clutter-gst +, elementary-icon-theme +, appstream +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "camera"; + pname = "elementary-camera"; version = "1.0.4"; - name = "elementary-${pname}-${version}"; + repoName = "camera"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1p532f961cjdg7szmxw7hw3av9v342hv5rx7in3bbhlc7adxflyc"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index a869ff24e920d..355f3ea8d0f69 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,25 +1,47 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala -, python3, desktop-file-utils, gtk3, granite, libgee, elementary-icon-theme -, appstream, libpeas, editorconfig-core-c, gtksourceview3, gtkspell3, libsoup -, vte, webkitgtk, zeitgeist, ctags, libgit2-glib, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, python3 +, desktop-file-utils +, gtk3 +, granite +, libgee +, elementary-icon-theme +, appstream +, libpeas +, editorconfig-core-c +, gtksourceview3 +, gtkspell3 +, libsoup +, vte +, webkitgtk +, zeitgeist +, ctags +, libgit2-glib +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "code"; + pname = "elementary-code"; version = "3.1.1"; - name = "elementary-${pname}-${version}"; + repoName = "code"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0l469fi5vbcazwfhy320nr8wrzz96jbrqn4hag0kdm16wvf5x1yc"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; @@ -36,8 +58,8 @@ stdenv.mkDerivation rec { buildInputs = [ ctags - elementary-icon-theme editorconfig-core-c + elementary-icon-theme granite gtk3 gtksourceview3 diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index ad4cfa86c279f..39924f52c346a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,25 +1,47 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, gettext, vala -, python3, desktop-file-utils, libcanberra, gtk3, libgee, granite, libnotify -, libunity, pango, plank, bamf, sqlite, libdbusmenu-gtk3, zeitgeist, glib-networking -, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, gettext +, vala +, python3 +, desktop-file-utils +, libcanberra +, gtk3 +, libgee +, granite +, libnotify +, libunity +, pango +, plank +, bamf +, sqlite +, libdbusmenu-gtk3 +, zeitgeist +, glib-networking +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "files"; + pname = "elementary-files"; version = "4.1.9"; - name = "elementary-${pname}-${version}"; + repoName = "files"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "12p1li9a7kqdlgkq20svaly5kr661ww93qngaiic6zv1bdw2bpmv"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; @@ -57,7 +79,8 @@ stdenv.mkDerivation rec { chmod +x meson/post_install.py patchShebangs meson/post_install.py - substituteInPlace filechooser-module/FileChooserDialog.vala --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas + substituteInPlace filechooser-module/FileChooserDialog.vala \ + --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index cba593e4c9600..7d235551a8029 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,27 +1,49 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson -, ninja, vala, desktop-file-utils, gtk3, granite -, python3, libgee, clutter-gtk, json-glib, libgda, libgpod -, libnotify, libpeas, libsoup, zeitgeist, gst_all_1, taglib -, libdbusmenu, libsignon-glib, libaccounts-glib -, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, desktop-file-utils +, gtk3 +, granite +, python3 +, libgee +, clutter-gtk +, json-glib +, libgda +, libgpod +, libnotify +, libpeas +, libsoup +, zeitgeist +, gst_all_1 +, taglib +, libdbusmenu +, libsignon-glib +, libaccounts-glib +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "music"; + pname = "elementary-music"; version = "5.0.4"; - name = "elementary-${pname}-${version}"; + repoName = "music"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "02qjsf9xnfh043xbls9mll2r1wcdvclw60x8wysv12rhbm90gwvp"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; @@ -51,9 +73,9 @@ stdenv.mkDerivation rec { libgda libgee libgpod - libsignon-glib libnotify libpeas + libsignon-glib libsoup taglib zeitgeist diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 1704db78c5e9e..94b6a2fce8ece 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -1,25 +1,53 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, desktop-file-utils -, gtk3, libaccounts-glib, libexif, libgee, geocode-glib, gexiv2,libgphoto2 -, granite, gst_all_1, libgudev, json-glib, libraw, librest, libsoup, sqlite, python3 -, scour, webkitgtk, libwebp, appstream, libunity, wrapGAppsHook, elementary-icon-theme }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, desktop-file-utils +, gtk3 +, libaccounts-glib +, libexif +, libgee +, geocode-glib +, gexiv2 +, libgphoto2 +, granite +, gst_all_1 +, libgudev +, json-glib +, libraw +, librest +, libsoup +, sqlite +, python3 +, scour +, webkitgtk +, libwebp +, appstream +, libunity +, wrapGAppsHook +, elementary-icon-theme +}: stdenv.mkDerivation rec { - pname = "photos"; + pname = "elementary-photos"; version = "2.6.4"; - name = "elementary-${pname}-${version}"; + repoName = "photos"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "17r9658s0pqy6s45ysi3915sm8hpvmsp7cw2jahqvjc61r4qpdc1"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; @@ -52,10 +80,10 @@ stdenv.mkDerivation rec { libgphoto2 libgudev libraw + librest libsoup libunity libwebp - librest scour sqlite webkitgtk diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index 74af15e27879e..4dd168f25f05f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -1,24 +1,37 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson -, ninja, vala, python3, desktop-file-utils, gtk3, granite, libgee -, libcanberra, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, python3 +, desktop-file-utils +, gtk3 +, granite +, libgee +, libcanberra +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93 + pname = "elementary-screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93 version = "1.6.2"; - name = "elementary-${pname}-${version}"; + repoName = "screenshot"; src = fetchFromGitHub { owner = "elementary"; - repo = "screenshot"; + repo = repoName; rev = version; sha256 = "1z61j96jk9zjr3bn5hgsp25m4v8h1rqwxm0kg8c34bvl06f13v8q"; }; passthru = { updateScript = pantheon.updateScript { - repoName = "screenshot"; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 2479d999e8fb6..8bd335c65305a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,24 +1,40 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3 -, vala, desktop-file-utils, gtk3, libxml2, granite, libnotify, vte, libgee -, elementary-icon-theme, appstream, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, python3 +, vala +, desktop-file-utils +, gtk3 +, libxml2 +, granite +, libnotify +, vte +, libgee +, elementary-icon-theme +, appstream +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "terminal"; + pname = "elementary-terminal"; version = "5.3.6"; - name = "elementary-${pname}-${version}"; + repoName = "terminal"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0jp21sy8k3jq3ycvng9yy2hbhcvfgiknxxa8vcg3c06vqhadmnc3"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 2d978d966b93a..9132707db2ba1 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -1,24 +1,39 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, python3 -, desktop-file-utils, gtk3, granite, libgee, clutter-gst, clutter-gtk, gst_all_1 -, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, python3 +, desktop-file-utils +, gtk3 +, granite +, libgee +, clutter-gst +, clutter-gtk +, gst_all_1 +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "videos"; + pname = "elementary-videos"; version = "2.6.3"; - name = "elementary-${pname}-${version}"; + repoName = "videos"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1ncm8kh6dcy83p8pmpilnk03b4dx3b1jm8w13izq2dkglfgdwvqx"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 859e04eb954d3..a03594b7b18be 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +}: stdenv.mkDerivation rec { pname = "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 6d7ecbffa3146..bd6df460c04bf 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,5 +1,17 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja -, pkgconfig, vala, libgee, granite, gtk3, switchboard, pciutils }: +{ stdenv +, fetchFromGitHub +, pantheon +, substituteAll +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +, pciutils +}: stdenv.mkDerivation rec { pname = "switchboard-plug-about"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 0d7586391ce07..dca9cc662a2bc 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja -, pkgconfig, vala, libgee, granite, gtk3, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +}: stdenv.mkDerivation rec { pname = "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 547b6d897e4ee..d1663ad48cd3b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, bluez, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, bluez +, switchboard +}: stdenv.mkDerivation rec { pname = "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 e1303a3cc48a9..fb7ea18e88bee 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -1,5 +1,18 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, substituteAll, pkgconfig -, vala, libgee, granite, gtk3, libxml2, switchboard, tzdata }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, substituteAll +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, libxml2 +, switchboard +, tzdata +}: stdenv.mkDerivation rec { pname = "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 22fb795297e0e..c15abfd8cb811 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja -, pkgconfig, vala, libgee, granite, gtk3, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +}: stdenv.mkDerivation rec { pname = "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 71f865bdeb629..ba753af7e2026 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -1,5 +1,20 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, libxml2, libgnomekbd, libxklavier, xorg, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, substituteAll +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, libxml2 +, libgnomekbd +, libxklavier +, xorg +, switchboard +}: stdenv.mkDerivation rec { pname = "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 76edfa18add65..00579c545254e 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala -, libgee, granite, gtk3, switchboard, elementary-settings-daemon }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +, elementary-settings-daemon +}: stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; @@ -17,7 +28,8 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace src/Views/General.vala --subst-var-by GSD_GSETTINGS ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas + substituteInPlace src/Views/General.vala \ + --subst-var-by GSD_GSETTINGS ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas ''; passthru = { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 283a13bd82aa5..09d6da4f24601 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -1,5 +1,18 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, substituteAll, vala -, libgee, granite, gtk3, networkmanager, networkmanagerapplet, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, substituteAll +, vala +, libgee +, granite +, gtk3 +, networkmanager +, networkmanagerapplet +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-network"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index 277f70cf984cc..e547f22fec168 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja -, pkgconfig, vala, libgee, granite, gtk3, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-notifications"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 496a69ce1f6b8..aa9cdfa0ddde9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -1,6 +1,21 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala -, libgee, granite, gtk3, libaccounts-glib, libsignon-glib, json-glib -, librest, webkitgtk, libsoup, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, libaccounts-glib +, libsignon-glib +, json-glib +, librest +, webkitgtk +, libsoup +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-onlineaccounts"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 57ae3215f5f3c..b9fad17c2f752 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -50,8 +50,10 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace src/Views/Appearance.vala --subst-var-by GALA_GSETTINGS_PATH ${gala}/share/gsettings-schemas/${gala.name}/glib-2.0/schemas - substituteInPlace src/Views/Appearance.vala --subst-var-by WINGPANEL_GSETTINGS_PATH ${wingpanel}/share/gsettings-schemas/${wingpanel.name}/glib-2.0/schemas + substituteInPlace src/Views/Appearance.vala \ + --subst-var-by GALA_GSETTINGS_PATH ${gala}/share/gsettings-schemas/${gala.name}/glib-2.0/schemas + substituteInPlace src/Views/Appearance.vala \ + --subst-var-by WINGPANEL_GSETTINGS_PATH ${wingpanel}/share/gsettings-schemas/${wingpanel.name}/glib-2.0/schemas ''; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 8a56a8535e8b4..461ddcd3764a5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -1,6 +1,20 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja -, pkgconfig, vala, libgee, elementary-dpms-helper, elementary-settings-daemon -, granite, gtk3, dbus, polkit, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, substituteAll +, meson +, ninja +, pkgconfig +, vala +, libgee +, elementary-dpms-helper +, elementary-settings-daemon +, granite +, gtk3 +, dbus +, polkit +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-power"; @@ -44,8 +58,10 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace src/MainView.vala --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${elementary-dpms-helper}/share/gsettings-schemas/${elementary-dpms-helper.name}/glib-2.0/schemas - substituteInPlace src/MainView.vala --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas + substituteInPlace src/MainView.vala \ + --subst-var-by DPMS_HELPER_GSETTINGS_PATH ${elementary-dpms-helper}/share/gsettings-schemas/${elementary-dpms-helper.name}/glib-2.0/schemas + substituteInPlace src/MainView.vala \ + --subst-var-by GSD_GSETTINGS_PATH ${elementary-settings-daemon}/share/gsettings-schemas/${elementary-settings-daemon.name}/glib-2.0/schemas ''; PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 293faad51c745..5c303e04982b6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, cups, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, cups +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-printers"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index d35844320a16d..19967c3bce053 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -1,6 +1,19 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja -, pkgconfig, vala, libgee, granite, gtk3, polkit, zeitgeist -, switchboard, lightlocker }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, python3 +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, polkit +, zeitgeist +, switchboard +, lightlocker +}: stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; @@ -46,8 +59,10 @@ stdenv.mkDerivation rec { chmod +x meson/post_install.py patchShebangs meson/post_install.py - substituteInPlace src/Views/LockPanel.vala --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${lightlocker}/share/gsettings-schemas/${lightlocker.name}/glib-2.0/schemas - substituteInPlace src/Views/FirewallPanel.vala --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas + substituteInPlace src/Views/LockPanel.vala \ + --subst-var-by LIGHTLOCKER_GSETTINGS_PATH ${lightlocker}/share/gsettings-schemas/${lightlocker.name}/glib-2.0/schemas + substituteInPlace src/Views/FirewallPanel.vala \ + --subst-var-by SWITCHBOARD_SEC_PRIV_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 265352ed8815f..b4aafb270062e 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig -, vala, libgee, granite, gtk3, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-sharing"; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index 907bdc37e2a7f..ed3518c764f91 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -1,5 +1,18 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, libgee -, granite, gtk3, pulseaudio, libcanberra, libcanberra-gtk3, switchboard }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, libgee +, granite +, gtk3 +, pulseaudio +, libcanberra +, libcanberra-gtk3 +, switchboard +}: stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 12edf97f6ba96..5c10cc0e9e4b2 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,6 +1,20 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja -, vala, gtk3, libgee, granite, gettext, clutter-gtk, libunity -, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, gtk3 +, libgee +, granite +, gettext +, clutter-gtk +, libunity +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "switchboard"; @@ -38,7 +52,9 @@ stdenv.mkDerivation rec { libunity ]; - patches = [ ./plugs-path-env.patch ]; + patches = [ + ./plugs-path-env.patch + ]; postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index f02f79b15a8a0..756ae86bb19d6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -1,4 +1,9 @@ -{ makeWrapper, symlinkJoin, switchboard, switchboardPlugs, plugs }: +{ makeWrapper +, symlinkJoin +, switchboard +, switchboardPlugs +, plugs +}: let selectedPlugs = if plugs == null then switchboardPlugs else plugs; diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index e30252bb71c29..fe9db999bb6cc 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +}: stdenv.mkDerivation rec { - pname = "stylesheet"; + pname = "elementary-gtk-theme"; version = "5.2.5"; - name = "elementary-gtk-theme-${version}"; + repoName = "stylesheet"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0934rfdwkn4315mhayzba8a3b6i1xczp66gl6n45hh5c81gb2p65"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-gtk-theme"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index d8fa143686ecb..bdf42b1c1ef0a 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -1,34 +1,43 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, python3,ninja, hicolor-icon-theme, gtk3 }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, python3 +, ninja +, hicolor-icon-theme +, gtk3 +}: stdenv.mkDerivation rec { - pname = "icons"; + pname = "elementary-icon-theme"; version = "5.0.4"; - name = "elementary-icon-theme-${version}"; + repoName = "icons"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0ha7biqvmkv68x1gi9bfcn5z0ld067pa5czx0pyf053pa86lg3hx"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-icon-theme"; + inherit repoName; + attrPath = pname; }; }; nativeBuildInputs = [ + gtk3 meson ninja python3 ]; - buildInputs = [ gtk3 ]; - - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; mesonFlags = [ "-Dvolume_icons=false" # Tries to install some icons to / diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index 061feb4b2d95f..76bdcf643f8fe 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, pantheon }: +{ stdenv +, fetchFromGitHub +, pantheon +}: stdenv.mkDerivation rec { pname = "elementary-redacted-script"; diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index 430acfd9ac1a2..aff830fda5687 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -1,22 +1,28 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +}: stdenv.mkDerivation rec { - pname = "sound-theme"; + pname = "elementary-sound-theme"; version = "1.0"; - name = "elementary-${pname}-${version}"; + repoName = "sound-theme"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1dc583lq61c361arjl3s44d2k72c46bqvcqv1c3s69f2ndsnxjdz"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 898d5f7b454f0..30145541750f8 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -1,26 +1,30 @@ -{ stdenv, fetchFromGitHub, pantheon }: +{ stdenv +, fetchFromGitHub +, pantheon +}: stdenv.mkDerivation rec { - pname = "wallpapers"; + pname = "elementary-wallpapers"; version = "5.3"; - name = "elementary-${pname}-${version}"; + repoName = "wallpapers"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1i0zf9gzhwm8hgq5cp1xnxipqjvgzd9wfiicz612hgp6ivc0z0ag"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; dontBuild = true; + dontConfigure = true; installPhase = '' mkdir -p $out/share/backgrounds/elementary diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index e7aea3be91efe..a1a69ee303fe0 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -1,22 +1,25 @@ -{ stdenv, fetchFromGitHub, pantheon }: +{ stdenv +, fetchFromGitHub +, pantheon +}: stdenv.mkDerivation rec { - pname = "default-settings"; + pname = "elementary-default-settings"; version = "5.1.0"; - name = "elementary-${pname}-${version}"; + repoName = "default-settings"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0l73py4rr56i4dalb2wh1c6qiwmcjkm0l1j75jp5agcnxldh5wym"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; @@ -25,6 +28,7 @@ stdenv.mkDerivation rec { ]; dontBuild = true; + dontConfigure = true; installPhase = '' mkdir -p $out/etc/gtk-3.0 diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index a71736887bb1e..8ef85b90a3b1a 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -5,22 +5,22 @@ , clutter-gtk, libGL, dbus, wrapGAppsHook }: stdenv.mkDerivation rec { - pname = "greeter"; + pname = "elementary-greeter"; version = "3.3.1"; - name = "elementary-${pname}-${version}"; + repoName = "greeter"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1vkq4z0hrmvzv4sh2qkxjajdxcycd1zj97a3pc8n4yb858pqfyzc"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index 2726ea2b9368e..dbcb992c425c4 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -1,4 +1,15 @@ -{ stdenv, runCommand, mutter, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas +{ stdenv +, runCommand +, mutter +, elementary-default-settings +, nixos-artwork +, glib +, gala +, epiphany +, elementary-settings-daemon +, gtk3 +, plank +, gsettings-desktop-schemas , extraGSettingsOverrides ? "" , extraGSettingsOverridePackages ? [] }: diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index d8634b48570d4..0be2431d33d83 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -1,22 +1,30 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, ninja, pkgconfig, vala, gtk3 }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, pkgconfig +, vala +, gtk3 +}: stdenv.mkDerivation rec { - pname = "print"; + pname = "elementary-print-shim"; version = "0.1.3"; - name = "elementary-print-shim-${version}"; + repoName = "print"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1w3cfap7j42x14mqpfqdm46hk5xc0v5kv8r6wxcnknr3sfxi8qlp"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}-shim"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 5fe22f0db8161..c262fb37dbc54 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,4 +1,18 @@ -{ stdenv, fetchFromGitHub, substituteAll, writeScript, pantheon, gnome-keyring, gnome-session, wingpanel, orca, at-spi2-core, elementary-default-settings, writeShellScriptBin, elementary-settings-daemon, runtimeShell }: +{ stdenv +, fetchFromGitHub +, substituteAll +, writeScript +, pantheon +, gnome-keyring +, gnome-session +, wingpanel +, orca +, at-spi2-core +, elementary-default-settings +, writeShellScriptBin +, elementary-settings-daemon +, runtimeShell +}: let @@ -7,7 +21,7 @@ let # # - # Upstream relies on /etc/skel to initiate a new users home directory with planks dockitems. + # Upstream relies on /etc/skel to initiate a new users home directory with plank's dockitems. # # That is not possible within nixos, but we can achieve this easily with a simple script that copies # them. We then use a xdg autostart and initalize it during the "EarlyInitialization" phase of a gnome session @@ -44,26 +58,27 @@ let in stdenv.mkDerivation rec { - pname = "session-settings"; + pname = "elementary-session-settings"; version = "5.0.3"; - name = "elementary-${pname}-${version}"; + repoName = "session-settings"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1vrjm7bklkfv0dyafm312v4hxzy6lb7p1ny4ijkn48kr719gc71k"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; dontBuild = true; + dontConfigure = true; installPhase = '' mkdir -p $out/share/applications diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index ca0ab888f149b..20b1ac7d353fb 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,23 +1,37 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, libxml2, desktop-file-utils -, gtk3, glib, granite, libgee, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, libxml2 +, desktop-file-utils +, gtk3 +, glib +, granite +, libgee +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "shortcut-overlay"; + pname = "elementary-shortcut-overlay"; version = "1.0.1"; - name = "elementary-${pname}-${version}"; + repoName = "shortcut-overlay"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "1ph4rx2l5fn0zh4fjfjlgbgskmzc0lvzqgcv7v4kr5m4rij1p4y4"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix index 4e19a65b58d48..973040a8da64e 100644 --- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix +++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix @@ -1,11 +1,14 @@ -{ stdenv, substituteAll, fetchFromGitHub, file-roller, gnome-bluetooth }: +{ stdenv +, substituteAll +, fetchFromGitHub +, file-roller +, gnome-bluetooth +}: stdenv.mkDerivation rec { pname = "extra-elementary-contracts"; version = "2018-08-21"; - name = "${pname}-${version}"; - src = fetchFromGitHub { owner = "worldofpeace"; repo = pname; @@ -22,6 +25,7 @@ stdenv.mkDerivation rec { ]; dontBuild = true; + dontConfigure = true; installPhase = '' mkdir -p $out/share/contractor diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 440426c00df01..b80e93279c8f9 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,7 +1,28 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala -, desktop-file-utils, gettext, libxml2, gtk3, granite, libgee, bamf, libcanberra -, libcanberra-gtk3, gnome-desktop, mutter, clutter, plank, elementary-icon-theme -, elementary-settings-daemon, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, desktop-file-utils +, gettext +, libxml2 +, gtk3 +, granite +, libgee +, bamf +, libcanberra +, libcanberra-gtk3 +, gnome-desktop +, mutter +, clutter +, plank +, elementary-icon-theme +, elementary-settings-daemon +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "gala"; @@ -48,7 +69,9 @@ stdenv.mkDerivation rec { plank ]; - patches = [ ./plugins-dir.patch ]; + patches = [ + ./plugins-dir.patch + ]; postPatch = '' chmod +x build-aux/meson/post_install.py diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 0d00ee2072dd7..9f40c0f9e5828 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,25 +1,46 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, python3 -, pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus -, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, zeitgeist -, bc }: +{ stdenv +, fetchFromGitHub +, pantheon +, substituteAll +, meson +, ninja +, python3 +, pkgconfig +, vala +, granite +, libgee +, gettext +, gtk3 +, appstream +, gnome-menus +, json-glib +, plank +, bamf +, switchboard +, libunity +, libsoup +, wingpanel +, zeitgeist +, bc +}: stdenv.mkDerivation rec { - pname = "applications-menu"; + pname = "wingpanel-applications-menu"; version = "2.4.3"; - name = "wingpanel-${pname}-${version}"; + repoName = "applications-menu"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "15mwfynaa57jii43x77iaz5gqjlylh5zxc70am8zgp8vhgzflvyd"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "wingpanel-${pname}"; + inherit repoName; + attrPath = pname; }; }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 4d7868a1d14c1..7e73adcd7e916 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -1,6 +1,20 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3 -, ninja, vala, gtk3, granite, libnotify, wingpanel, libgee, libxml2 -, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, gtk3 +, granite +, libnotify +, wingpanel +, libgee +, libxml2 +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 7012969006035..1ab3c579e145f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,6 +1,24 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pantheon, pkgconfig, meson, python3 -, ninja, vala, gtk3, granite, wingpanel, evolution-data-server -, libical, libgee, libxml2, libsoup, elementary-calendar, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, gtk3 +, granite +, wingpanel +, evolution-data-server +, libical +, libgee +, libxml2 +, libsoup +, elementary-calendar +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-datetime"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index aa63f82c96523..00a57cb994337 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -1,6 +1,21 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja -, substituteAll, vala, gtk3, granite, libxml2, wingpanel, libgee -, xorg, libgnomekbd, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, substituteAll +, vala +, gtk3 +, granite +, libxml2 +, wingpanel +, libgee +, xorg +, libgnomekbd +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-keyboard"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index a201d6864a66e..d5ce97df509dc 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,6 +1,19 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala -, gtk3, granite, networkmanager, networkmanagerapplet, wingpanel -, libgee, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, gtk3 +, granite +, networkmanager +, networkmanagerapplet +, wingpanel +, libgee +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index fd4e1cc7e1775..0eab02bf8c80d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -1,5 +1,18 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala -, gtk3, granite, wingpanel, libgee, libxml2, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, gtk3 +, granite +, wingpanel +, libgee +, libxml2 +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-nightlight"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 03369c3ad42e1..78c901a23063d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -1,5 +1,18 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, gtk3, granite -, wingpanel, libgee, libwnck3, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, gtk3 +, granite +, wingpanel +, libgee +, libwnck3 +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index a9af53449c9ab..f63cca74a4dc9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -1,6 +1,21 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3 -, ninja, vala, gtk3, granite, bamf, libgtop, udev, wingpanel -, libgee, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, gtk3 +, granite +, bamf +, libgtop +, udev +, wingpanel +, libgee +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "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 61572f07e2ed2..b363cb5485a5c 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -1,6 +1,18 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson -, ninja, vala, gtk3, granite, wingpanel, accountsservice -, libgee, elementary-icon-theme, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, gtk3 +, granite +, wingpanel +, accountsservice +, libgee +, elementary-icon-theme +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-session"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 3e17813fde2a9..6d0e791d1e41b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -1,7 +1,22 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson -, python3, ninja, vala, gtk3, granite, wingpanel, libnotify -, pulseaudio, libcanberra-gtk3, libgee, libxml2, wrapGAppsHook -, elementary-icon-theme }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, gtk3 +, granite +, wingpanel +, libnotify +, pulseaudio +, libcanberra-gtk3 +, libgee +, libxml2 +, wrapGAppsHook +, elementary-icon-theme +}: stdenv.mkDerivation rec { pname = "wingpanel-indicator-sound"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index be6c89f9c05d8..b98c205d49150 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -1,5 +1,20 @@ -{ stdenv, fetchFromGitHub, pantheon, wrapGAppsHook, pkgconfig, meson, ninja -, vala, gala, gtk3, libgee, granite, gettext, mutter, json-glib, python3 }: +{ stdenv +, fetchFromGitHub +, pantheon +, wrapGAppsHook +, pkgconfig +, meson +, ninja +, vala +, gala +, gtk3 +, libgee +, granite +, gettext +, mutter +, json-glib +, python3 +}: stdenv.mkDerivation rec { pname = "wingpanel"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix index cfae604d3a53c..6b554d89caa9f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -1,4 +1,11 @@ -{ lib, makeWrapper, symlinkJoin, wingpanel, wingpanelIndicators, switchboard-with-plugs, indicators ? null }: +{ lib +, makeWrapper +, symlinkJoin +, wingpanel +, wingpanelIndicators +, switchboard-with-plugs +, indicators ? null +}: let selectedIndicators = if indicators == null then wingpanelIndicators else indicators; diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index cc612407bf614..7fba9610db0b4 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -1,4 +1,20 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3, meson, ninja, vala, pkgconfig, libgee, pantheon, gtk3, glib, gettext, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, python3 +, meson +, ninja +, vala +, pkgconfig +, libgee +, pantheon +, gtk3 +, glib +, gettext +, hicolor-icon-theme +, gobject-introspection +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "granite"; diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/pkgs/desktops/pantheon/services/cerbere/default.nix index 28e39464bfab0..a8eaf766664e0 100644 --- a/pkgs/desktops/pantheon/services/cerbere/default.nix +++ b/pkgs/desktops/pantheon/services/cerbere/default.nix @@ -1,4 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, glib, libgee, vala, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, glib +, libgee +, vala +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "cerbere"; diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index d7d3cdb03125b..6401b96a2eab5 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -1,4 +1,17 @@ -{ stdenv, fetchFromGitHub, pantheon, meson, python3, ninja, pkgconfig, vala, glib, libgee, dbus, glib-networking, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, python3 +, ninja +, pkgconfig +, vala +, glib +, libgee +, dbus +, glib-networking +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "contractor"; @@ -33,7 +46,7 @@ stdenv.mkDerivation rec { libgee ]; - PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "share/dbus-1/services"; + PKG_CONFIG_DBUS_1_SESSION_BUS_SERVICES_DIR = "${placeholder ''out''}/share/dbus-1/services"; meta = with stdenv.lib; { description = "A desktop-wide extension service used by elementary OS"; diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index 055706b1521a0..6305c872b2fa0 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -1,23 +1,37 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja, vala -, desktop-file-utils, gtk3, granite, libgee, gcr, webkitgtk, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, python3 +, ninja +, vala +, desktop-file-utils +, gtk3 +, granite +, libgee +, gcr +, webkitgtk +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "capnet-assist"; + pname = "elementary-capnet-assist"; version = "2.2.3"; - name = "elementary-${pname}-${version}"; + repoName = "capnet-assist"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "15cnwimkmmsb4rwvgm8bizcsn1krsj6k3qc88izn79is75y6wwji"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; @@ -40,7 +54,9 @@ stdenv.mkDerivation rec { ]; # Not useful here or in elementary - See: https://github.com/elementary/capnet-assist/issues/3 - patches = [ ./remove-capnet-test.patch ]; + patches = [ + ./remove-capnet-test.patch + ]; postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix index 54f556e3a92ec..fb9d28eaf6b1c 100644 --- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix @@ -1,28 +1,37 @@ -{ stdenv, fetchFromGitHub, pantheon, makeWrapper, meson, ninja, desktop-file-utils, glib, coreutils, elementary-settings-daemon, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, meson +, ninja +, desktop-file-utils +, glib +, coreutils +, elementary-settings-daemon +, wrapGAppsHook +}: stdenv.mkDerivation rec { - pname = "dpms-helper"; + pname = "elementary-dpms-helper"; version = "1.0"; - name = "elementary-${pname}-${version}"; + repoName = "dpms-helper"; src = fetchFromGitHub { owner = "elementary"; - repo = pname; + repo = repoName; rev = version; sha256 = "0svfp0qyb6nx4mjl3jx4aqmb4x24m25jpi75mdis3yfr3c1xz9nh"; }; passthru = { updateScript = pantheon.updateScript { - repoName = pname; - attrPath = "elementary-${pname}"; + inherit repoName; + attrPath = pname; }; }; nativeBuildInputs = [ desktop-file-utils - makeWrapper meson ninja wrapGAppsHook diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index d8514c51f4f70..8381796c45617 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -44,16 +44,16 @@ stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; version = "3.30.2"; - projectName = "gnome-settings-daemon"; + repoName = "gnome-settings-daemon"; src = fetchurl { - url = "mirror://gnome/sources/${projectName}/${stdenv.lib.versions.majorMinor version}/${projectName}-${version}.tar.xz"; + url = "mirror://gnome/sources/${repoName}/${stdenv.lib.versions.majorMinor version}/${repoName}-${version}.tar.xz"; sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"; }; # Source for ubuntu's patchset src2 = fetchgit { - url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${projectName}"; + url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${repoName}"; rev = "refs/tags/ubuntu/${version}-1ubuntu1"; sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c"; }; @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { - packageName = projectName; + packageName = repoName; attrPath = "pantheon.${pname}"; }; }; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 79bc4bc6a0126..8afbbbeed829c 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -1,5 +1,17 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, vala, glib -, gtk3, libgee, desktop-file-utils, geoclue2, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, glib +, gtk3 +, libgee +, desktop-file-utils +, geoclue2 +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "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 d9e5512ce784a..53a65ddb9474c 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja -, vala, gtk3, libgee, polkit, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pantheon +, pkgconfig +, meson +, ninja +, vala +, gtk3 +, libgee +, polkit +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "pantheon-agent-polkit"; diff --git a/pkgs/desktops/pantheon/update.nix b/pkgs/desktops/pantheon/update.nix index 0162de7349a3c..7e9aacc0c2b27 100644 --- a/pkgs/desktops/pantheon/update.nix +++ b/pkgs/desktops/pantheon/update.nix @@ -1,5 +1,21 @@ -{ runCommand, nix, bash, git, jq, nix-prefetch-scripts, coreutils, common-updater-scripts, gnugrep, gnused, curl }: -{ repoName, attrPath ? repoName, versionPolicy ? "release" }: +{ runCommand +, nix +, bash +, git +, jq +, nix-prefetch-scripts +, coreutils +, common-updater-scripts +, gnugrep +, gnused +, curl +}: + +{ repoName +, attrPath ? repoName +, versionPolicy ? "release" +}: + let script = ./update.sh; @@ -13,6 +29,8 @@ let chmod +x $out ''; - versionFlag = { "release" = "-r"; "master" = "-m"; }.${versionPolicy}; + throwFlag = throw "${versionPolicy} is not a valid versionPolicy - Options are either 'release' or 'master' (defaults to release)."; + + versionFlag = { "release" = "-r"; "master" = "-m"; }.${versionPolicy} or throwFlag; in [ updateScript versionFlag repoName attrPath ]