From 97aa62680da6b63dfd40efc106c391a365192f94 Mon Sep 17 00:00:00 2001 From: amusingimpala75 <69653100+amusingimpala75@users.noreply.github.com> Date: Tue, 10 Nov 2026 09:56:46 -0500 Subject: [PATCH] emacs: update emureader to 0.4.0 I can't wait until they nixpkgs has a working custom build for this --- modules/default.nix | 2 +- packages/by-name/custom-emacs/init.el | 2 +- packages/emacs-packages/emureader/package.nix | 48 +++++++++++++++++ ...g-disabling-block-just-always-use-it.patch | 41 -------------- packages/emacs-packages/reader/package.nix | 54 ------------------- 5 files changed, 50 insertions(+), 97 deletions(-) create mode 100644 packages/emacs-packages/emureader/package.nix delete mode 100644 packages/emacs-packages/reader/0001-remove-pkg-config-disabling-block-just-always-use-it.patch delete mode 100644 packages/emacs-packages/reader/package.nix diff --git a/modules/default.nix b/modules/default.nix index b03a049..29948c4 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -22,7 +22,7 @@ }: { packages = lib.filterAttrs (_: v: lib.isDerivation v) pkgs.local // { - emacs-reader = pkgs.emacsPackages.reader; + emacs-emureader = pkgs.emacsPackages.emureader; emacs-org-modern-indent = pkgs.emacsPackages.org-modern-indent; }; }; diff --git a/packages/by-name/custom-emacs/init.el b/packages/by-name/custom-emacs/init.el index 81b9cd3..42335f5 100644 --- a/packages/by-name/custom-emacs/init.el +++ b/packages/by-name/custom-emacs/init.el @@ -424,7 +424,7 @@ (use-package writeroom-mode :ensure t) -(use-package reader +(use-package emureader :ensure t) (use-package files diff --git a/packages/emacs-packages/emureader/package.nix b/packages/emacs-packages/emureader/package.nix new file mode 100644 index 0000000..76daa58 --- /dev/null +++ b/packages/emacs-packages/emureader/package.nix @@ -0,0 +1,48 @@ +{ + fetchFromGitea, + lib, + melpaBuild, + nix-update-script, + stdenv, + + emacs, + pkg-config, + mupdf-headless, + ... +}: +let + version = "0.4.0"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "MonadicSheep"; + repo = "emureader"; + tag = version; + hash = "sha256-Ot0f0eWLJEv/bka7guUjL1HcqLDTZUUxxdSK0I/ogNY="; + }; + core = stdenv.mkDerivation { + inherit src version; + pname = "emureader-core"; + buildFlags = [ + "CC=cc" + "USE_PKGCONFIG=yes" + ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + mupdf-headless + emacs + ]; + installPhase = '' + runHook preInstall + + install -Dm444 -t $out/lib/ emureader-dyn${stdenv.targetPlatform.extensions.sharedLibrary} + + runHook postInstall + ''; + }; +in +melpaBuild { + pname = "emureader"; + inherit src version; + + files = ''(:defaults "${lib.getLib core}/lib/emureader-dyn${stdenv.targetPlatform.extensions.sharedLibrary}")''; +} diff --git a/packages/emacs-packages/reader/0001-remove-pkg-config-disabling-block-just-always-use-it.patch b/packages/emacs-packages/reader/0001-remove-pkg-config-disabling-block-just-always-use-it.patch deleted file mode 100644 index d75b739..0000000 --- a/packages/emacs-packages/reader/0001-remove-pkg-config-disabling-block-just-always-use-it.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 403f3b3869d944acbeb8de2027315d8bd768c270 Mon Sep 17 00:00:00 2001 -From: amusingimpala75 <69653100+amusingimpala75@users.noreply.github.com> -Date: Fri, 6 Mar 2026 14:36:13 -0500 -Subject: [PATCH] remove pkg-config disabling block; just always use it - ---- - Makefile | 19 ------------------- - 1 file changed, 19 deletions(-) - -diff --git a/Makefile b/Makefile -index c1569ce..1c4f9a2 100644 ---- a/Makefile -+++ b/Makefile -@@ -29,25 +29,6 @@ else - endif - USE_PKGCONFIG := yes - --ifeq ($(HAVE_GUIX),yes) -- $(info Guix detected: skipping pkg-config checks.) -- USE_PKGCONFIG := no --else ifeq ($(HAVE_NIX),yes) -- $(info Nix detected: skipping pkg-config checks.) -- USE_PKGCONFIG := no --else ifeq ($(HAVE_DNF),yes) -- $(info dnf detected: skipping pkg-config checks.) -- USE_PKGCONFIG := no --else ifeq ($(OS_NAME),Darwin) -- $(info macOS detected: skipping pkg-config and using Homebrew for MuPDF paths.) -- USE_PKGCONFIG := no --else ifeq ($(OS_NAME),FreeBSD) -- $(info FreeBSD detected: skipping pkg-config checks.) -- USE_PKGCONFIG := no --else ifeq ($(HAVE_MINGW64), yes) -- $(info MinGW64 detected: assuming dll is located in $(MINGW_PREFIX)/bin.) --endif -- - ifeq ($(OS_NAME),Darwin) - SO := dylib - else ifeq ($(HAVE_MINGW64),yes) --- -2.52.0 diff --git a/packages/emacs-packages/reader/package.nix b/packages/emacs-packages/reader/package.nix deleted file mode 100644 index ab136de..0000000 --- a/packages/emacs-packages/reader/package.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - fetchFromGitea, - lib, - melpaBuild, - nix-update-script, - stdenv, - - emacs, - pkg-config, - mupdf-headless, - ... -}: -let - version = "0-unstable-2026-09-30"; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "MonadicSheep"; - repo = "emacs-reader"; - rev = "424c84659b2882021700640eac9ed8f0995db0f6"; - hash = "sha256-XKLLX2/r8kTEIkkqGCmcGR/OU3/iXiZmwLjqVAZDX7s="; - }; - core = stdenv.mkDerivation { - inherit src version; - pname = "emacs-reader-core"; - buildFlags = [ "CC=cc" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - mupdf-headless - emacs - ]; - installPhase = '' - runHook preInstall - - install -Dm444 -t $out/lib/ render-core${stdenv.targetPlatform.extensions.sharedLibrary} - - runHook postInstall - ''; - # Necessary on darwin (tries to use homebrew over nix for some reason) - patches = [ ./0001-remove-pkg-config-disabling-block-just-always-use-it.patch ]; - }; -in -melpaBuild { - pname = "reader"; - inherit src version; - passthru.updateScript = nix-update-script { - attrPath = "emacs-reader"; - extraArgs = [ - "--flake" - "--version=branch" - ]; - }; - - files = ''(:defaults "${lib.getLib core}/lib/render-core.*")''; -} -- knotmirror 0.0.1