|
|
@ -1,7 +1,6 @@ |
|
|
|
{ lib |
|
|
|
{ lib |
|
|
|
, stdenv |
|
|
|
, stdenv |
|
|
|
, fetchFromGitHub |
|
|
|
, fetchFromGitHub |
|
|
|
, fetchpatch |
|
|
|
|
|
|
|
, nix-update-script |
|
|
|
, nix-update-script |
|
|
|
, pkg-config |
|
|
|
, pkg-config |
|
|
|
, meson |
|
|
|
, meson |
|
|
@ -20,13 +19,13 @@ |
|
|
|
|
|
|
|
|
|
|
|
stdenv.mkDerivation rec { |
|
|
|
stdenv.mkDerivation rec { |
|
|
|
pname = "wingpanel-indicator-keyboard"; |
|
|
|
pname = "wingpanel-indicator-keyboard"; |
|
|
|
version = "2.4.0"; |
|
|
|
version = "2.4.1"; |
|
|
|
|
|
|
|
|
|
|
|
src = fetchFromGitHub { |
|
|
|
src = fetchFromGitHub { |
|
|
|
owner = "elementary"; |
|
|
|
owner = "elementary"; |
|
|
|
repo = pname; |
|
|
|
repo = pname; |
|
|
|
rev = version; |
|
|
|
rev = version; |
|
|
|
sha256 = "10zzsil5l6snz47nx887r22sl2n0j6bg4dhxmgk3j3xp3jhgmrgl"; |
|
|
|
sha256 = "sha256-AmTAl7N+2zYRUgmnuP+S+m0n6nUIihcB5kisWoPPlTQ="; |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
patches = [ |
|
|
|
patches = [ |
|
|
@ -34,12 +33,6 @@ stdenv.mkDerivation rec { |
|
|
|
src = ./fix-paths.patch; |
|
|
|
src = ./fix-paths.patch; |
|
|
|
gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display"; |
|
|
|
gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display"; |
|
|
|
}) |
|
|
|
}) |
|
|
|
# Upstream code not respecting our localedir |
|
|
|
|
|
|
|
# https://github.com/elementary/wingpanel-indicator-keyboard/pull/110 |
|
|
|
|
|
|
|
(fetchpatch { |
|
|
|
|
|
|
|
url = "https://github.com/elementary/wingpanel-indicator-keyboard/commit/ea5df2f62a99a216ee5ed137268e710490a852a4.patch"; |
|
|
|
|
|
|
|
sha256 = "0fmdz10xgzsryj0f0dnpjrh9yygjkb91a7pxg0rwddxbprhnr7j0"; |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
]; |
|
|
|
]; |
|
|
|
|
|
|
|
|
|
|
|
nativeBuildInputs = [ |
|
|
|
nativeBuildInputs = [ |
|
|
|