work in progress

main
Ingolf Wagner 2022-06-17 08:54:31 +02:00
parent e34791a673
commit 2ef4e3266c
Signed by: palo
GPG Key ID: 76BF5F1928B9618B
3 changed files with 33 additions and 9 deletions

10
bisect.sh Normal file
View File

@ -0,0 +1,10 @@
#!/usr/bin/env bash
set -x
cd ~/dev/valentina
rm -rf build
mkdir build
cd build
qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache
make

View File

@ -25,6 +25,18 @@
# TODO: Legacy attribute, drop soon
defaultPackage = self.packages.${system}.default;
devShells.default = pkgs.mkShell {
buildInputs = [
pkgs.qt5.full
pkgs.qtcreator
pkgs.libGL
pkgs.qt5.qtsvg
pkgs.poppler_utils
pkgs.qt5.qtxmlpatterns
pkgs.qt5.qt3d
pkgs.qt5.qmake
];
};
}));
}

View File

@ -31,16 +31,10 @@ mkDerivation rec {
substituteInPlace common.pri \
--replace '$$[QT_INSTALL_HEADERS]/QtXmlPatterns' '${getDev qtxmlpatterns}/include/QtXmlPatterns' \
--replace '$$[QT_INSTALL_HEADERS]/QtSvg' '${getDev qtsvg}/include/QtSvg'
substituteInPlace src/app/translations.pri \
--replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${getDev qttools}/bin/lrelease'
'';
# --replace '$$[QT_INSTALL_HEADERS]/' '${getDev qtbase}/include/' \
# --replace '$$[QT_INSTALL_HEADERS]' '${getDev qtbase}'
# substituteInPlace src/app/translations.pri \
# --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${getDev qttools}/bin/lrelease'
# substituteInPlace src/app/seamly2d/mainwindowsnogui.cpp \
# --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${getBin poppler_utils}/bin/pdftops"'
# substituteInPlace src/app/valentina/dialogs/dialogsavelayout.h \
# --replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${getBin poppler_utils}/bin/pdftops"'
#'';
nativeBuildInputs = [
pkg-config
@ -60,6 +54,9 @@ mkDerivation rec {
];
qmakeFlags = [
"-r"
"PREFIX=/"
"PREFIX_LIB=/usr/lib"
"Seamly2D.pro"
"CONFIG+=noDebugSymbols"
"CONFIG+=no_ccache"
@ -69,6 +66,11 @@ mkDerivation rec {
installFlags = [ "INSTALL_ROOT=$(out)" ];
#postInstall = ''
# mv $out/lib/Seamly2D/* $out/lib/
# rmdir $out/lib/Seamly2D
#'';
meta = {
description = "An open source sewing pattern drafting software";
homepage = "https://valentinaproject.bitbucket.io/";