diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-01-17 22:27:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-17 22:27:53 +0800 |
| commit | 467dd2df056b6598a6f44a86e939997ea4a18d69 (patch) | |
| tree | 314b1c25b73672d891f2aff3a921fcbaa2511fdf /pkgs/desktops/pantheon/desktop | |
| parent | 483aec3fe0afffa1d43b45c28d947e46394e7562 (diff) | |
| parent | d277f1354abf9d4d86c54f1c4caa61c78e0720a5 (diff) | |
| download | nixpkgs-467dd2df056b6598a6f44a86e939997ea4a18d69.tar nixpkgs-467dd2df056b6598a6f44a86e939997ea4a18d69.tar.gz nixpkgs-467dd2df056b6598a6f44a86e939997ea4a18d69.tar.bz2 nixpkgs-467dd2df056b6598a6f44a86e939997ea4a18d69.tar.lz nixpkgs-467dd2df056b6598a6f44a86e939997ea4a18d69.tar.xz nixpkgs-467dd2df056b6598a6f44a86e939997ea4a18d69.tar.zst nixpkgs-467dd2df056b6598a6f44a86e939997ea4a18d69.zip | |
Merge pull request #154837 from bobby285271/pantheon-meson
Pantheon: prepare for meson 0.61
Diffstat (limited to 'pkgs/desktops/pantheon/desktop')
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix | 14 |
2 files changed, 18 insertions, 3 deletions
diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 25bce374c23..72df609c5a4 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , linkFarm , substituteAll @@ -90,6 +91,12 @@ stdenv.mkDerivation rec { 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 = '' diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index fbde187ce6d..1d4a1cb7414 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -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 |