JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pantheon.elementary-shortcut-overlay: pull upstream fix for meson 0.61

Browse Source 
i18n.merge_file has been ignoring positional arguments for a time and explicitly rejects with error since meson 0.61
This commit is contained in:
Bobby Rong 2022-01-13 11:58:13 +08:00
parent bb56f4b4e8
commit e941b7465b
No known key found for this signature in database
GPG Key ID: ED07364437C91161
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson
@ -21,15 +22,22 @@ stdenv.mkDerivation rec {
pname = "elementary-shortcut-overlay";
version = "1.2.1";
repoName = "shortcut-overlay";
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
repo = "shortcut-overlay";
rev = version;
sha256 = "sha256-qmqzGCM3cVM6y80pzjm5CCyG6BO6XlKZiODAAEnwVrM=";
};
patches = [
# Fix build with meson 0.61
# https://github.com/elementary/shortcut-overlay/pull/113
(fetchpatch {
url = "https://github.com/elementary/shortcut-overlay/commit/130f78eb4b7770586ea98ba0a5fdbbf5bb116f3f.patch";
sha256 = "sha256-XXWq9CEv3Z2B8ogcFQAJZCfy19XxNHs3c8NToE2m/aA=";
})
];
nativeBuildInputs = [
desktop-file-utils
libxml2