pantheon: use repoName
Now these expressions don't look so weird.
This commit is contained in:
@@ -2,22 +2,22 @@
|
||||
, 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;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,22 +1,22 @@
|
||||
{ stdenv, fetchFromGitHub, pantheon, makeWrapper, 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;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -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}";
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user