From 99e1037b351d7736bd72d29813fd195e1df26ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?= Date: Mon, 30 Dec 2024 11:56:00 +0700 Subject: [PATCH 1/3] notify-osd: use finalAttrs w/ mkDerivation --- pkgs/by-name/no/notify-osd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/notify-osd/package.nix b/pkgs/by-name/no/notify-osd/package.nix index b67cbd0f6009..96fb8f11bd5e 100644 --- a/pkgs/by-name/no/notify-osd/package.nix +++ b/pkgs/by-name/no/notify-osd/package.nix @@ -11,12 +11,12 @@ gsettings-desktop-schemas, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "notify-osd"; version = "0.9.34"; src = fetchurl { - url = "https://launchpad.net/notify-osd/precise/${version}/+download/notify-osd-${version}.tar.gz"; + url = "https://launchpad.net/notify-osd/precise/${finalAttrs.version}/+download/notify-osd-${finalAttrs.version}.tar.gz"; sha256 = "0g5a7a680b05x27apz0y1ldl5csxpp152wqi42s107jymbp0s20j"; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.bodil ]; platforms = platforms.linux; }; -} +}) From fbae2ec8ad52874c85666ee5f301d8e34496dfca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?= Date: Mon, 30 Dec 2024 11:57:10 +0700 Subject: [PATCH 2/3] notify-osd: remove fat `with lib` --- pkgs/by-name/no/notify-osd/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/no/notify-osd/package.nix b/pkgs/by-name/no/notify-osd/package.nix index 96fb8f11bd5e..0d880657823d 100644 --- a/pkgs/by-name/no/notify-osd/package.nix +++ b/pkgs/by-name/no/notify-osd/package.nix @@ -39,12 +39,12 @@ stdenv.mkDerivation (finalAttrs: { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - meta = with lib; { + meta = { description = "Daemon that displays passive pop-up notifications"; mainProgram = "notify-osd"; homepage = "https://launchpad.net/notify-osd"; - license = licenses.gpl3; - maintainers = [ maintainers.bodil ]; - platforms = platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ bodil ]; + platforms = lib.platforms.linux; }; }) From 5f7c8194f5b4d0f904ad40af7476d0fb0a587d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B9=82=E0=B8=97=E0=B8=AA=E0=B8=95=E0=B8=B1=E0=B8=A5?= Date: Mon, 30 Dec 2024 12:34:55 +0700 Subject: [PATCH 3/3] =?UTF-8?q?notify-osd:=200.9.24=20=E2=86=92=200.9.35+2?= =?UTF-8?q?0.04.20191129?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- pkgs/by-name/no/notify-osd/package.nix | 34 +++++++++++++++++++++----- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/no/notify-osd/package.nix b/pkgs/by-name/no/notify-osd/package.nix index 0d880657823d..c6d0758fcfe2 100644 --- a/pkgs/by-name/no/notify-osd/package.nix +++ b/pkgs/by-name/no/notify-osd/package.nix @@ -1,38 +1,60 @@ { lib, stdenv, - fetchurl, + fetchzip, pkg-config, glib, libwnck, libnotify, + libtool, dbus-glib, makeWrapper, + gnome-common, gsettings-desktop-schemas, }: stdenv.mkDerivation (finalAttrs: { pname = "notify-osd"; - version = "0.9.34"; + version = "0.9.35+20.04.20191129"; - src = fetchurl { - url = "https://launchpad.net/notify-osd/precise/${finalAttrs.version}/+download/notify-osd-${finalAttrs.version}.tar.gz"; - sha256 = "0g5a7a680b05x27apz0y1ldl5csxpp152wqi42s107jymbp0s20j"; + src = fetchzip { + url = "https://launchpad.net/ubuntu/+archive/primary/+files/notify-osd_${finalAttrs.version}.orig.tar.gz"; + sha256 = "sha256-aSU83HoWhHZtob8NFHFYNUIIZAecvQ/p0z62KMlQNCU="; + stripRoot = false; }; nativeBuildInputs = [ pkg-config makeWrapper + libtool ]; + buildInputs = [ glib libwnck libnotify dbus-glib gsettings-desktop-schemas + gnome-common ]; - configureFlags = [ "--libexecdir=$(out)/bin" ]; + env = { + NIX_CFLAGS_COMPILE = "-fpermissive"; + }; + + # deprecated function: g_memdup + postPatch = '' + substituteInPlace src/stack.c \ + --replace-fail "g_memdup" "g_memdup2" + ''; + + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + + configureFlags = [ + ''--libexecdir=$(out)/bin'' + ]; preFixup = '' wrapProgram "$out/bin/notify-osd" \