Skip to content

Commit 5f7c819

Browse files
committed
notify-osd: 0.9.24 → 0.9.35+20.04.20191129
Borrowed build changes from Arch’s notify-osd + Nixpkgs’s notify-osd-customizable. It would be wonderful if Nixpkgs, like Arch, could self-host their code forge so we weren’t required to have accounts with or interact with proprietary, US-based Microsoft GitHub.
1 parent fbae2ec commit 5f7c819

File tree

1 file changed

+28
-6
lines changed

1 file changed

+28
-6
lines changed

pkgs/by-name/no/notify-osd/package.nix

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,60 @@
11
{
22
lib,
33
stdenv,
4-
fetchurl,
4+
fetchzip,
55
pkg-config,
66
glib,
77
libwnck,
88
libnotify,
9+
libtool,
910
dbus-glib,
1011
makeWrapper,
12+
gnome-common,
1113
gsettings-desktop-schemas,
1214
}:
1315

1416
stdenv.mkDerivation (finalAttrs: {
1517
pname = "notify-osd";
16-
version = "0.9.34";
18+
version = "0.9.35+20.04.20191129";
1719

18-
src = fetchurl {
19-
url = "https://launchpad.net/notify-osd/precise/${finalAttrs.version}/+download/notify-osd-${finalAttrs.version}.tar.gz";
20-
sha256 = "0g5a7a680b05x27apz0y1ldl5csxpp152wqi42s107jymbp0s20j";
20+
src = fetchzip {
21+
url = "https://launchpad.net/ubuntu/+archive/primary/+files/notify-osd_${finalAttrs.version}.orig.tar.gz";
22+
sha256 = "sha256-aSU83HoWhHZtob8NFHFYNUIIZAecvQ/p0z62KMlQNCU=";
23+
stripRoot = false;
2124
};
2225

2326
nativeBuildInputs = [
2427
pkg-config
2528
makeWrapper
29+
libtool
2630
];
31+
2732
buildInputs = [
2833
glib
2934
libwnck
3035
libnotify
3136
dbus-glib
3237
gsettings-desktop-schemas
38+
gnome-common
3339
];
3440

35-
configureFlags = [ "--libexecdir=$(out)/bin" ];
41+
env = {
42+
NIX_CFLAGS_COMPILE = "-fpermissive";
43+
};
44+
45+
# deprecated function: g_memdup
46+
postPatch = ''
47+
substituteInPlace src/stack.c \
48+
--replace-fail "g_memdup" "g_memdup2"
49+
'';
50+
51+
preConfigure = ''
52+
NOCONFIGURE=1 ./autogen.sh
53+
'';
54+
55+
configureFlags = [
56+
''--libexecdir=$(out)/bin''
57+
];
3658

3759
preFixup = ''
3860
wrapProgram "$out/bin/notify-osd" \

0 commit comments

Comments
 (0)