Skip to content

Commit b110150

Browse files
authored
wxSVG: move to pkgs/by-name, use new apple sdk pattern (#370933)
2 parents 2dcaf9d + 8870a8b commit b110150

File tree

2 files changed

+10
-18
lines changed

2 files changed

+10
-18
lines changed

pkgs/development/libraries/wxSVG/default.nix renamed to pkgs/by-name/wx/wxSVG/package.nix

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,15 @@
88
libexif,
99
pango,
1010
pkg-config,
11-
wxGTK,
12-
darwin,
11+
wxGTK32,
1312
}:
1413

15-
let
16-
inherit (darwin.apple_sdk.frameworks) Cocoa;
17-
in
18-
stdenv.mkDerivation rec {
19-
pname = "wxSVG";
14+
stdenv.mkDerivation (finalAttrs: {
15+
pname = "wxsvg";
2016
version = "1.5.25";
2117

2218
src = fetchurl {
23-
url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/wxsvg-${version}.tar.bz2";
19+
url = "mirror://sourceforge/project/wxsvg/wxsvg/${finalAttrs.version}/wxsvg-${finalAttrs.version}.tar.bz2";
2420
hash = "sha256-W/asaDG1S9Ga70jN6PoFctu2PzCu6dUyP2vms/MmU0s=";
2521
};
2622

@@ -40,21 +36,21 @@ stdenv.mkDerivation rec {
4036
ffmpeg
4137
libexif
4238
pango
43-
wxGTK
44-
] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa;
39+
wxGTK32
40+
];
4541

4642
enableParallelBuilding = true;
4743

48-
meta = with lib; {
44+
meta = {
4945
homepage = "https://wxsvg.sourceforge.net/";
5046
description = "SVG manipulation library built with wxWidgets";
5147
mainProgram = "svgview";
5248
longDescription = ''
5349
wxSVG is C++ library to create, manipulate and render Scalable Vector
5450
Graphics (SVG) files with the wxWidgets toolkit.
5551
'';
56-
license = licenses.gpl2Plus;
52+
license = lib.licenses.gpl2Plus;
5753
maintainers = [ ];
58-
inherit (wxGTK.meta) platforms;
54+
inherit (wxGTK32.meta) platforms;
5955
};
60-
}
56+
})

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10905,10 +10905,6 @@ with pkgs;
1090510905
inherit (libsForQt5.callPackage ../development/libraries/wt { })
1090610906
wt4;
1090710907

10908-
wxSVG = callPackage ../development/libraries/wxSVG {
10909-
wxGTK = wxGTK32;
10910-
};
10911-
1091210908
inherit (callPackages ../development/libraries/xapian { })
1091310909
xapian_1_4;
1091410910
xapian = xapian_1_4;

0 commit comments

Comments
 (0)