diff options
| author | Bobby Rong <rjl931189261@126.com> | 2021-10-30 21:23:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-30 21:23:08 +0800 |
| commit | 07f6ceafd6887f782453f9d99dc62a89ef6c6019 (patch) | |
| tree | 4d3ac523a39dad8288b4adebd5d861ad536fb46b /pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix | |
| parent | 1be106018c74cb47c0cec3ba78c68b9d790c4204 (diff) | |
| parent | 5e6446cef086c6f623dbd6b2a417fe3c7251569b (diff) | |
| download | nixpkgs-07f6ceafd6887f782453f9d99dc62a89ef6c6019.tar nixpkgs-07f6ceafd6887f782453f9d99dc62a89ef6c6019.tar.gz nixpkgs-07f6ceafd6887f782453f9d99dc62a89ef6c6019.tar.bz2 nixpkgs-07f6ceafd6887f782453f9d99dc62a89ef6c6019.tar.lz nixpkgs-07f6ceafd6887f782453f9d99dc62a89ef6c6019.tar.xz nixpkgs-07f6ceafd6887f782453f9d99dc62a89ef6c6019.tar.zst nixpkgs-07f6ceafd6887f782453f9d99dc62a89ef6c6019.zip | |
Merge pull request #143790 from bobby285271/pantheon
Pantheon updates 2021-10-29
Diffstat (limited to 'pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix')
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index d9d6decb96c..eb8563bc50d 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , pkg-config @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "elementary-shortcut-overlay"; - version = "1.2.0"; + version = "1.2.1"; repoName = "shortcut-overlay"; @@ -28,22 +28,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1zs2fpx4agr00rsfmpi00nhiw92mlypzm4p9x3g851p24m62fn79"; - }; - - patches = [ - # Upstream code not respecting our localedir - # https://github.com/elementary/shortcut-overlay/pull/100 - (fetchpatch { - url = "https://github.com/elementary/shortcut-overlay/commit/f26e3684568e30cb6e151438e2d86c4d392626bf.patch"; - sha256 = "0zxyqpk9xbxdm8lmgdwbb4yzzwbjlhypsca3xs34a2pl0b9pcdwd"; - }) - ]; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-qmqzGCM3cVM6y80pzjm5CCyG6BO6XlKZiODAAEnwVrM="; }; nativeBuildInputs = [ @@ -65,6 +50,12 @@ stdenv.mkDerivation rec { libhandy ]; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "A native OS-wide shortcut overlay to be launched by Gala"; homepage = "https://github.com/elementary/shortcut-overlay"; |