Skip to content

Commit 0317c88

Browse files
emarynemaryn
authored andcommitted
seamly2d: 2022-08-15.0339 -> 2025.2.24.204
1 parent a245263 commit 0317c88

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

pkgs/applications/graphics/seamly2d/default.nix

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,24 @@
1717
python3,
1818
qttools,
1919
git,
20+
qtmultimedia,
2021
}:
2122
let
2223
qtPython = python3.withPackages (pkgs: with pkgs; [ pyqt5 ]);
2324
in
2425
stdenv.mkDerivation rec {
2526
pname = "seamly2d";
26-
version = "2022-08-15.0339";
27+
version = "2025.2.24.204";
2728

2829
src = fetchFromGitHub {
2930
owner = "FashionFreedom";
3031
repo = "Seamly2D";
31-
rev = "v${version}";
32-
sha256 = "13jxkg84jfz8g52zwhh5jvi23wryzkavwbsfalzr9m04blj5xnik";
32+
tag = "v${version}";
33+
hash = "sha256-Mz4uXYohMf5SE/NWbFtw3hXEIXBWr3A0zuWGeD+zkQE=";
3334
};
3435

3536
buildInputs = [
37+
qtmultimedia
3638
git
3739
qtPython
3840
qtbase
@@ -56,19 +58,10 @@ stdenv.mkDerivation rec {
5658
];
5759

5860
postPatch = ''
59-
substituteInPlace common.pri \
60-
--replace '$$[QT_INSTALL_HEADERS]/QtXmlPatterns' '${lib.getDev qtxmlpatterns}/include/QtXmlPatterns' \
61-
--replace '$$[QT_INSTALL_HEADERS]/QtSvg' '${lib.getDev qtsvg}/include/QtSvg' \
62-
--replace '$$[QT_INSTALL_HEADERS]/' '${lib.getDev qtbase}/include/' \
63-
--replace '$$[QT_INSTALL_HEADERS]' '${lib.getDev qtbase}'
64-
substituteInPlace src/app/translations.pri \
65-
--replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease'
6661
substituteInPlace src/app/seamly2d/mainwindowsnogui.cpp \
67-
--replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${lib.getBin poppler-utils}/bin/pdftops"'
62+
--replace-fail 'define PDFTOPS "pdftops"' 'define PDFTOPS "${lib.getBin poppler-utils}/bin/pdftops"'
6863
substituteInPlace src/libs/vwidgets/export_format_combobox.cpp \
69-
--replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${lib.getBin poppler-utils}/bin/pdftops"'
70-
substituteInPlace src/app/seamlyme/mapplication.cpp \
71-
--replace 'diagrams.rcc' '../share/diagrams.rcc'
64+
--replace-fail 'define PDFTOPS "pdftops"' 'define PDFTOPS "${lib.getBin poppler-utils}/bin/pdftops"'
7265
'';
7366

7467
qmakeFlags = [
@@ -83,9 +76,6 @@ stdenv.mkDerivation rec {
8376
installFlags = [ "INSTALL_ROOT=$(out)" ];
8477

8578
postInstall = ''
86-
mv $out/usr/share $out/
87-
rmdir $out/usr
88-
8979
mv $out/share/seamly2d/* $out/share/.
9080
rmdir $out/share/seamly2d
9181

0 commit comments

Comments
 (0)