From 223b74afe76755f8fec6fb8926bf67779c130b67 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 29 Dec 2024 12:41:02 +0100 Subject: [PATCH 1/3] obconf: fix build --- .../ob/obconf/fix-implicit-declarations.patch | 37 +++++++++++++++++++ pkgs/by-name/ob/obconf/package.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/by-name/ob/obconf/fix-implicit-declarations.patch diff --git a/pkgs/by-name/ob/obconf/fix-implicit-declarations.patch b/pkgs/by-name/ob/obconf/fix-implicit-declarations.patch new file mode 100644 index 000000000000..8db96f379034 --- /dev/null +++ b/pkgs/by-name/ob/obconf/fix-implicit-declarations.patch @@ -0,0 +1,37 @@ +diff --git a/src/appearance.c b/src/appearance.c +index 4fb3f0c..7ae9cab 100644 +--- a/src/appearance.c ++++ b/src/appearance.c +@@ -20,6 +20,7 @@ + #include "main.h" + #include "tree.h" + #include "preview_update.h" ++#include + + static gboolean mapping = FALSE; + +diff --git a/src/desktops.h b/src/desktops.h +index 1ba3e36..968595e 100644 +--- a/src/desktops.h ++++ b/src/desktops.h +@@ -22,6 +22,7 @@ + + #include + ++void desktops_setup_tab(); + void desktops_setup_num(GtkWidget *w); + void desktops_setup_names(GtkWidget *w); + +diff --git a/src/main.c b/src/main.c +index d7e3446..fdfae54 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -28,6 +28,8 @@ + #include "dock.h" + #include "preview_update.h" + #include "gettext.h" ++#include "desktops.h" ++#include "moveresize.h" + + #include + #define SN_API_NOT_YET_FROZEN diff --git a/pkgs/by-name/ob/obconf/package.nix b/pkgs/by-name/ob/obconf/package.nix index 9b233017b4ea..603879bfbe85 100644 --- a/pkgs/by-name/ob/obconf/package.nix +++ b/pkgs/by-name/ob/obconf/package.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-qwm66VA/ueRMFtSUcrmuObNkz+KYgWRnmR7TnQwpxiE="; }; + patches = [ ./fix-implicit-declarations.patch ]; + nativeBuildInputs = [ autoreconfHook pkg-config From 7e0f8e62c6bb596fa538acabd60bf04df8ff9ac0 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 29 Dec 2024 12:41:16 +0100 Subject: [PATCH 2/3] obconf: fix --replace warning --- pkgs/by-name/ob/obconf/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ob/obconf/package.nix b/pkgs/by-name/ob/obconf/package.nix index 603879bfbe85..7d34f991361c 100644 --- a/pkgs/by-name/ob/obconf/package.nix +++ b/pkgs/by-name/ob/obconf/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - substituteInPlace configure.ac --replace 2.0.4 ${finalAttrs.version} + substituteInPlace configure.ac --replace-fail 2.0.4 ${finalAttrs.version} ''; meta = { From f751ac8d906ea89d0641bf72a12262abd21fc299 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 29 Dec 2024 12:53:20 +0100 Subject: [PATCH 3/3] obconf: set strictDeps = true --- pkgs/by-name/ob/obconf/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ob/obconf/package.nix b/pkgs/by-name/ob/obconf/package.nix index 7d34f991361c..e35e4d2fc7f1 100644 --- a/pkgs/by-name/ob/obconf/package.nix +++ b/pkgs/by-name/ob/obconf/package.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation (finalAttrs: { openbox ]; + strictDeps = true; + postPatch = '' substituteInPlace configure.ac --replace-fail 2.0.4 ${finalAttrs.version} '';