ipe: migrate to by-name (#431767)

This commit is contained in:
Yohann Boniface 2025-08-09 05:24:19 +02:00 committed by GitHub
commit ae1b5a76f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 32 additions and 31 deletions

View File

@ -0,0 +1,8 @@
{
ghostscript,
}:
ghostscript.override {
cupsSupport = true;
x11Support = true;
}

View File

@ -0,0 +1,8 @@
{
ghostscript,
}:
ghostscript.override {
cupsSupport = false;
x11Support = false;
}

View File

@ -7,53 +7,53 @@
copyDesktopItems, copyDesktopItems,
cairo, cairo,
freetype, freetype,
ghostscript, ghostscriptX,
gsl, gsl,
libjpeg, libjpeg,
libpng, libpng,
libspiro, libspiro,
lua5, lua5,
qtbase, qt6Packages,
qtsvg,
texliveSmall, texliveSmall,
qhull, qhull,
wrapQtAppsHook,
zlib, zlib,
withTeXLive ? true, withTeXLive ? true,
withQVoronoi ? false, withQVoronoi ? false,
buildPackages, buildPackages,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "ipe"; pname = "ipe";
version = "7.2.30"; version = "7.2.30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "otfried"; owner = "otfried";
repo = "ipe"; repo = "ipe";
tag = "v${version}"; tag = "v${finalAttrs.version}";
hash = "sha256-bvwEgEP/cinigixJr8e964sm6secSK+7Ul7WFfwM0gE="; hash = "sha256-bvwEgEP/cinigixJr8e964sm6secSK+7Ul7WFfwM0gE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
copyDesktopItems copyDesktopItems
wrapQtAppsHook qt6Packages.wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [
cairo cairo
freetype freetype
ghostscript ghostscriptX
gsl gsl
libjpeg libjpeg
libpng libpng
libspiro libspiro
lua5 lua5
]
++ (with qt6Packages; [
qtbase qtbase
qtsvg qtsvg
zlib zlib
] ])
++ (lib.optionals withTeXLive [ ++ (lib.optionals withTeXLive [
texliveSmall texliveSmall
]) ])
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
desktopItems = [ desktopItems = [
(makeDesktopItem { (makeDesktopItem {
name = pname; name = "ipe";
desktopName = "Ipe"; desktopName = "Ipe";
genericName = "Drawing editor"; genericName = "Drawing editor";
comment = "A drawing editor for creating figures in PDF format"; comment = "A drawing editor for creating figures in PDF format";
@ -100,19 +100,19 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
mkdir -p $out/share/icons/hicolor/128x128/apps mkdir -p $out/share/icons/hicolor/128x128/apps
ln -s $out/share/ipe/${version}/icons/icon_128x128.png $out/share/icons/hicolor/128x128/apps/ipe.png ln -s $out/share/ipe/${finalAttrs.version}/icons/icon_128x128.png $out/share/icons/hicolor/128x128/apps/ipe.png
''; '';
meta = with lib; { meta = {
description = "Editor for drawing figures"; description = "Editor for drawing figures";
homepage = "http://ipe.otfried.org"; # https not available homepage = "http://ipe.otfried.org"; # https not available
license = licenses.gpl3Plus; license = lib.licenses.gpl3Plus;
longDescription = '' longDescription = ''
Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. Ipe is an extensible drawing editor for creating figures in PDF and Postscript format.
It supports making small figures for inclusion into LaTeX-documents It supports making small figures for inclusion into LaTeX-documents
as well as presentations in PDF. as well as presentations in PDF.
''; '';
maintainers = with maintainers; [ ttuegel ]; maintainers = with lib.maintainers; [ ttuegel ];
platforms = platforms.linux; platforms = lib.platforms.linux;
}; };
} })

View File

@ -12500,11 +12500,6 @@ with pkgs;
lua = lua5_1; lua = lua5_1;
}; };
ipe = qt6Packages.callPackage ../applications/graphics/ipe {
ghostscript = ghostscriptX;
lua5 = lua5_3;
};
ir.lv2 = callPackage ../applications/audio/ir.lv2 { }; ir.lv2 = callPackage ../applications/audio/ir.lv2 { };
jabcode = callPackage ../development/libraries/jabcode { }; jabcode = callPackage ../development/libraries/jabcode { };
@ -15539,16 +15534,6 @@ with pkgs;
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
}; };
ghostscriptX = ghostscript.override {
cupsSupport = true;
x11Support = true;
};
ghostscript_headless = ghostscript.override {
cupsSupport = false;
x11Support = false;
};
gnuk = callPackage ../misc/gnuk { gnuk = callPackage ../misc/gnuk {
gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;