Merge pull request #146574 from bobby285271/pantheon

pantheon.wingpanel-indicator-sound: 6.0.0 -> 6.0.1
This commit is contained in:
Bobby Rong 2021-11-19 16:12:57 +08:00 committed by GitHub
commit de32b56030
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,6 @@
{ lib, stdenv
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pantheon
, pkg-config
@ -20,30 +20,15 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-sound";
version = "6.0.0";
version = "6.0.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0cv97c0qrhqisyghy9a9qr4ffcx3g4bkswxm6rn4r2wfg4gvljri";
sha256 = "sha256-FHZ4YhGLqGTz5Po2XFJvnWuAi1eHKcT9zzgJFHic02E=";
};
patches = [
# Upstream code not respecting our localedir
# https://github.com/elementary/wingpanel-indicator-sound/pull/216
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-sound/commit/df816104c15e4322c1077313b1f43114cdaf710e.patch";
sha256 = "029z7l467jz1ymxwrzrf874062r6xmskl7mldpq39jh110fijy5l";
})
# Fix build with vala 0.54
# https://github.com/elementary/wingpanel-indicator-sound/pull/221
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-sound/commit/398d181eabe3dd803dc0ba335ac629902ec5b5ab.patch";
sha256 = "1r2x3n6ws56jk7xcgk60am8mc5dgf8pz5ipsydxvmlrmipkjxyqi";
})
];
nativeBuildInputs = [
libxml2
meson