diff --git a/bisect.sh b/bisect.sh new file mode 100644 index 0000000..3968156 --- /dev/null +++ b/bisect.sh @@ -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 diff --git a/flake.nix b/flake.nix index 0b30667..64b968b 100644 --- a/flake.nix +++ b/flake.nix @@ -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 + ]; + }; })); } diff --git a/pkgs/seamly2d-2022-06-13.nix b/pkgs/seamly2d-2022-06-13.nix index 3358309..520e516 100644 --- a/pkgs/seamly2d-2022-06-13.nix +++ b/pkgs/seamly2d-2022-06-13.nix @@ -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/";