From d9e684a371df7caaf6437f22e1cf0c6da4092eaa Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Sat, 31 May 2025 21:13:35 +0200 Subject: [PATCH] podofo_0_9: rename attr and alias, adopt, top-level, remove 'with lib', switch source from sourceforge to github, remove unused dep expat --- pkgs/by-name/ca/calibre/package.nix | 2 +- .../po/podofo_0_9/package.nix} | 21 +++++++++++-------- pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 14 insertions(+), 12 deletions(-) rename pkgs/{development/libraries/podofo/default.nix => by-name/po/podofo_0_9/package.nix} (77%) diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 52c1d0061ed8..0f2b25262a63 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -157,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: { export FC_INC_DIR=${fontconfig.dev}/include/fontconfig export FC_LIB_DIR=${fontconfig.lib}/lib export PODOFO_INC_DIR=${podofo.dev}/include/podofo - export PODOFO_LIB_DIR=${podofo.lib}/lib + export PODOFO_LIB_DIR=${podofo}/lib export XDG_DATA_HOME=$out/share export XDG_UTILS_INSTALL_MODE="user" export PIPER_TTS_DIR=${piper-tts}/bin diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/by-name/po/podofo_0_9/package.nix similarity index 77% rename from pkgs/development/libraries/podofo/default.nix rename to pkgs/by-name/po/podofo_0_9/package.nix index c49c31be8822..1d7bf196678c 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/by-name/po/podofo_0_9/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, cmake, zlib, freetype, @@ -13,16 +13,17 @@ lua5, pkg-config, libidn, - expat, }: stdenv.mkDerivation rec { version = "0.9.8"; pname = "podofo"; - src = fetchurl { - url = "mirror://sourceforge/podofo/${pname}-${version}.tar.gz"; - sha256 = "sha256-XeYH4V8ZK4rZBzgwB1nYjeoPXM3OO/AASKDJMrxkUVQ="; + src = fetchFromGitHub { + owner = "podofo"; + repo = "podofo"; + rev = version; + hash = "sha256-VGsACeCC8xKC1n/ackT576ZU3ZR1LAw8H0l/Q9cH27s="; }; outputs = [ @@ -45,7 +46,6 @@ stdenv.mkDerivation rec { openssl libpng libidn - expat lua5 ]; @@ -64,13 +64,16 @@ stdenv.mkDerivation rec { -e 's/^libdir=.*/libdir=@CMAKE_INSTALL_LIBDIR@/' -e "$failNoMatches" ''; - meta = with lib; { + meta = { homepage = "https://podofo.sourceforge.net"; description = "Library to work with the PDF file format"; - platforms = platforms.all; - license = with licenses; [ + platforms = lib.platforms.all; + license = with lib.licenses; [ gpl2Plus lgpl2Plus ]; + maintainers = with lib.maintainers; [ + kuflierl + ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf24872632db..bf64a3e6cbb1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9291,9 +9291,8 @@ with pkgs; place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at; - podofo = callPackage ../development/libraries/podofo { }; - podofo010 = callPackage ../development/libraries/podofo/0.10.x.nix { }; + podofo = podofo_0_9; poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };