wxSVG: move to pkgs/by-name, use new apple sdk pattern (NixOS#370933)

geodic · Jan 9, 2025 · b110150 · b110150
2 parents 2dcaf9d + 8870a8b
commit b110150
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/pkgs/development/libraries/wxSVG/default.nix → pkgs/by-name/wx/wxSVG/package.nix b/pkgs/development/libraries/wxSVG/default.nix → pkgs/by-name/wx/wxSVG/package.nix
@@ -8,19 +8,15 @@
   libexif,
   pango,
   pkg-config,
-  wxGTK,
-  darwin,
+  wxGTK32,
 }:
 
-let
-  inherit (darwin.apple_sdk.frameworks) Cocoa;
-in
-stdenv.mkDerivation rec {
-  pname = "wxSVG";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "wxsvg";
   version = "1.5.25";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/wxsvg-${version}.tar.bz2";
+    url = "mirror://sourceforge/project/wxsvg/wxsvg/${finalAttrs.version}/wxsvg-${finalAttrs.version}.tar.bz2";
     hash = "sha256-W/asaDG1S9Ga70jN6PoFctu2PzCu6dUyP2vms/MmU0s=";
   };
 
@@ -40,21 +36,21 @@ stdenv.mkDerivation rec {
     ffmpeg
     libexif
     pango
-    wxGTK
-  ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa;
+    wxGTK32
+  ];
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://wxsvg.sourceforge.net/";
     description = "SVG manipulation library built with wxWidgets";
     mainProgram = "svgview";
     longDescription = ''
       wxSVG is C++ library to create, manipulate and render Scalable Vector
       Graphics (SVG) files with the wxWidgets toolkit.
     '';
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    inherit (wxGTK.meta) platforms;
+    inherit (wxGTK32.meta) platforms;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -10905,10 +10905,6 @@ with pkgs;
   inherit (libsForQt5.callPackage ../development/libraries/wt { })
     wt4;
 
-  wxSVG = callPackage ../development/libraries/wxSVG {
-    wxGTK = wxGTK32;
-  };
-
   inherit (callPackages ../development/libraries/xapian { })
     xapian_1_4;
   xapian = xapian_1_4;