diff --git a/pkgs/vgc/default.nix b/pkgs/vgc/default.nix index 37597693..f38568d8 100644 --- a/pkgs/vgc/default.nix +++ b/pkgs/vgc/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , wrapQtAppsHook +, qtbase , cmake , python3 , harfbuzz @@ -14,24 +15,32 @@ # reproducible. stdenv.mkDerivation rec { pname = "vgc"; - version = "unstable-2022-08-27"; + version = "unstable-2023-02-05"; src = fetchFromGitHub { owner = "vgc"; repo = "vgc"; - rev = "e7db360f27b059c3dfd0e002c6b29f6a558edd47"; - sha256 = "sha256-yHQKOMBfMVS9+mwulgTEFOl9bE5CA+psJUaE432YTmo="; + rev = "8e8d958ab9f7fa6f741346d60f17af44d7abb592"; + sha256 = "sha256-84dckIOrHmxVX7U7VM1Le6tEqG1cJYaAfBcbKqJ6Ros="; fetchSubmodules = true; }; - nativeBuildInputs = [ wrapQtAppsHook cmake harfbuzz ]; + patches = [ + ./patches/set-reproducible-build.patch + ]; - buildInputs = [ python3 git freetype libGLU ]; + nativeBuildInputs = [ wrapQtAppsHook cmake ]; + + buildInputs = [ + python3 + git + freetype + harfbuzz + libGLU + qtbase + ]; meta = with lib; { - # Harfbuzz CMake path is not correct. See NixOS/nixpkgs#180054 for the - # specific issue. Wait until this has been resolved. - broken = true; homepage = "https://www.vgc.io/"; description = "Upcoming suite of vector-drawing applications that makes use of Vector Graphics Complex (VGC)"; diff --git a/pkgs/vgc/patches/set-reproducible-build.patch b/pkgs/vgc/patches/set-reproducible-build.patch new file mode 100644 index 00000000..8c8c26ea --- /dev/null +++ b/pkgs/vgc/patches/set-reproducible-build.patch @@ -0,0 +1,15 @@ +diff --git a/tools/version.py b/tools/version.py +index feb53ce..6f03c85 100644 +--- a/tools/version.py ++++ b/tools/version.py +@@ -320,8 +320,8 @@ if __name__ == "__main__": + res += "buildCompilerVersion=" + buildCompilerVersion + "\n" + res += "buildArchitecture=" + buildArchitecture + "\n" + res += "buildConfig=" + buildConfig + "\n" +- res += "buildDate=" + now.date().isoformat() + "\n" +- res += "buildTime=" + now.time().isoformat(timespec="seconds") + "\n" ++ res += "buildDate=" + "1970-01-01" + "\n" ++ res += "buildTime=" + "00:00:00" + "\n" + + # Write to file + versionDir = Path(buildDir) / buildConfig / "resources" / "core"