diff --git a/README.md b/README.md new file mode 100644 index 0000000..82ce88e --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ + +`nix build ".#seamly2d" -L` to build seamly2d. +`nix build ".#valentina" -L` to build valentina. diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..59f4e39 --- /dev/null +++ b/flake.lock @@ -0,0 +1,42 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1653893745, + "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1655255117, + "narHash": "sha256-Csls0+1hz2S0IFx74YiVdb53zqz+R0huJNOEQnSfh6g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5b9c07333237392c5ef31a9923fff929e4be7c44", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 94314f8..05486f4 100644 --- a/flake.nix +++ b/flake.nix @@ -15,10 +15,10 @@ let pkgs = nixpkgs.legacyPackages.${system}; in { - packages.valentina-061 = pkgs.libsForQt512.callPackage pkgs/valentina-0.6.1.nix {}; + packages.valentina-061 = pkgs.libsForQt512.callPackage pkgs/valentina-0.6.1.nix { }; packages.valentina = self.packages.${system}.valentina-061; - packages.seamly2d = pkgs.libsForQt512.callPackage pkgs/seamly2d.nix {}; + packages.seamly2d = pkgs.libsForQt512.callPackage pkgs/seamly2d-2022-06-13.nix { }; # nix build packages.default = self.packages.${system}.valentina; diff --git a/pkgs/seamly2d-2022-06-13.nix b/pkgs/seamly2d-2022-06-13.nix new file mode 100644 index 0000000..4512e18 --- /dev/null +++ b/pkgs/seamly2d-2022-06-13.nix @@ -0,0 +1,97 @@ +{ mkDerivation +, lib +, fetchFromGitHub +, pkg-config +, libGL + +, qmake +, qttools +, qtbase +, qtsvg +, qtxmlpatterns +, qt3d +, poppler_utils +, wrapQtAppsHook +}: + +with lib; + +mkDerivation rec { + pname = "seamly2d"; + version = "2022-06-13.0319"; + + src = fetchFromGitHub { + owner = "FashionFreedom"; + repo = "Seamly2D"; + rev = "v${version}"; + sha256 = "sha256-qm8Hlt3z0jABV71Pxa6ZbNmf/ixwp74zh2HZnnMVQSY="; + }; + + #postPatch = '' + # substituteInPlace common.pri \ + # --replace '$$[QT_INSTALL_HEADERS]/QtXmlPatterns' '${getDev qtxmlpatterns}/include/QtXmlPatterns' \ + # --replace '$$[QT_INSTALL_HEADERS]/QtSvg' '${getDev qtsvg}/include/QtSvg' \ + # --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 + qmake + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + poppler_utils + libGL + + qtbase + qtsvg + qtxmlpatterns + qt3d + ]; + + #configurePhase = '' + # qmake PREFIX=/ Seamly2D.pro -r "CONFIG += noTests noRunPath no_ccache noDebugSymbols" + #''; + + qmakeFlags = [ + "PREFIX=/" + "Seamly2D.pro" + "CONFIG+=noDebugSymbols" + "CONFIG+=no_ccache" + "CONFIG+=noTests" + "CONFIG+=noRunPath" + ]; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + #postInstall = '' + # mv $out/usr/share $out/ + # rmdir $out/usr + # + # mkdir -p $out/share/man/man1 + # gzip -9c dist/debian/valentina.1 > $out/share/man/man1/valentina.1.gz + # gzip -9c dist/debian/tape.1 > $out/share/man/man1/tape.1.gz + # + # mkdir -p $out/share/mime/packages + # cp dist/debian/valentina.sharedmimeinfo $out/share/mime/packages/valentina.xml + #''; + + #enableParallelBuilding = true; + + meta = { + description = "An open source sewing pattern drafting software"; + homepage = "https://valentinaproject.bitbucket.io/"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/valentina-0.6.1.nix b/pkgs/valentina-0.6.1.nix index 8ac6c02..49da548 100644 --- a/pkgs/valentina-0.6.1.nix +++ b/pkgs/valentina-0.6.1.nix @@ -1,6 +1,11 @@ -{ mkDerivation, lib, fetchFromGitLab -, qmake, qttools -, qtbase, qtsvg, qtxmlpatterns +{ mkDerivation +, lib +, fetchFromGitLab +, qmake +, qttools +, qtbase +, qtsvg +, qtxmlpatterns , poppler_utils }: