ipe: migrate to by-name

ipe: refactor package definitions

ghostscript: migrate to by-name

4 files changed, 32 insertions, 31 deletions

diff --git a/pkgs/by-name/gh/ghostscriptX/package.nix b/pkgs/by-name/gh/ghostscriptX/package.nix
new file mode 100644
index 000000000000..e49be1ba159f
--- /dev/null
+++ b/pkgs/by-name/gh/ghostscriptX/package.nix
@@ -0,0 +1,8 @@
+{
+  ghostscript,
+}:
+
+ghostscript.override {
+  cupsSupport = true;
+  x11Support = true;
+}
diff --git a/pkgs/by-name/gh/ghostscript_headless/package.nix b/pkgs/by-name/gh/ghostscript_headless/package.nix
new file mode 100644
index 000000000000..1cd90e6802ae
--- /dev/null
+++ b/pkgs/by-name/gh/ghostscript_headless/package.nix
@@ -0,0 +1,8 @@
+{
+  ghostscript,
+}:
+
+ghostscript.override {
+  cupsSupport = false;
+  x11Support = false;
+}
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/by-name/ip/ipe/package.nix
index f34826525fce..e72d1455778e 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/by-name/ip/ipe/package.nix
@@ -7,53 +7,53 @@
   copyDesktopItems,
   cairo,
   freetype,
-  ghostscript,
+  ghostscriptX,
   gsl,
   libjpeg,
   libpng,
   libspiro,
   lua5,
-  qtbase,
-  qtsvg,
+  qt6Packages,
   texliveSmall,
   qhull,
-  wrapQtAppsHook,
   zlib,
   withTeXLive ? true,
   withQVoronoi ? false,
   buildPackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ipe";
   version = "7.2.30";
 
   src = fetchFromGitHub {
     owner = "otfried";
     repo = "ipe";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-bvwEgEP/cinigixJr8e964sm6secSK+7Ul7WFfwM0gE=";
   };
 
   nativeBuildInputs = [
     pkg-config
     copyDesktopItems
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
     cairo
     freetype
-    ghostscript
+    ghostscriptX
     gsl
     libjpeg
     libpng
     libspiro
     lua5
+  ]
+  ++ (with qt6Packages; [
     qtbase
     qtsvg
     zlib
-  ]
+  ])
   ++ (lib.optionals withTeXLive [
     texliveSmall
   ])
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
 
   desktopItems = [
     (makeDesktopItem {
-      name = pname;
+      name = "ipe";
       desktopName = "Ipe";
       genericName = "Drawing editor";
       comment = "A drawing editor for creating figures in PDF format";
@@ -100,19 +100,19 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     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";
     homepage = "http://ipe.otfried.org"; # https not available
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     longDescription = ''
       Ipe is an extensible drawing editor for creating figures in PDF and Postscript format.
       It supports making small figures for inclusion into LaTeX-documents
       as well as presentations in PDF.
     '';
-    maintainers = with maintainers; [ ttuegel ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ ttuegel ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2187a7fa3929..8459278e5b7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12513,11 +12513,6 @@ with pkgs;
     lua = lua5_1;
   };
 
-  ipe = qt6Packages.callPackage ../applications/graphics/ipe {
-    ghostscript = ghostscriptX;
-    lua5 = lua5_3;
-  };
-
   ir.lv2 = callPackage ../applications/audio/ir.lv2 { };
 
   jabcode = callPackage ../development/libraries/jabcode { };
@@ -15564,16 +15559,6 @@ with pkgs;
     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 {
     gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
     binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;