Merge pull request #116002 from fatho/fix/dunst-src-hash
dunst: fix 1.6.1 src and build
This commit is contained in:
commit
1394179695
|
@ -2,7 +2,7 @@
|
||||||
, pkg-config, which, perl, libXrandr
|
, pkg-config, which, perl, libXrandr
|
||||||
, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
|
, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
|
||||||
, gtk3, wayland, wayland-protocols
|
, gtk3, wayland, wayland-protocols
|
||||||
, libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false
|
, libXinerama, libnotify, pango, xorgproto, librsvg
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||||
owner = "dunst-project";
|
owner = "dunst-project";
|
||||||
repo = "dunst";
|
repo = "dunst";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0irwkqcgwkqaylcpvqgh25gn2ysbdm2kydipxfzcq1ddj9ns6f9c";
|
sha256 = "0lga1kj2vjbj9g9rl93nivngjmk5fkxdxwal8w96x9whwk9jvdga";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];
|
nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ];
|
||||||
|
@ -29,15 +29,12 @@ stdenv.mkDerivation rec {
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"PREFIX=$(out)"
|
"PREFIX=$(out)"
|
||||||
"VERSION=$(version)"
|
"VERSION=$(version)"
|
||||||
|
"SYSCONFDIR=$(out)/etc"
|
||||||
"SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
|
"SERVICEDIR_DBUS=$(out)/share/dbus-1/services"
|
||||||
"SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
|
"SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
|
||||||
];
|
];
|
||||||
|
|
||||||
buildFlags = if dunstify then [ "dunstify" ] else [];
|
postInstall = ''
|
||||||
|
|
||||||
postInstall = lib.optionalString dunstify ''
|
|
||||||
install -Dm755 dunstify $out/bin
|
|
||||||
'' + ''
|
|
||||||
wrapProgram $out/bin/dunst \
|
wrapProgram $out/bin/dunst \
|
||||||
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
|
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue