about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-11-21 01:44:59 +0100
committerGitHub <noreply@github.com>2023-11-21 01:44:59 +0100
commitfda1c759e01bcc9f94ecf237c85b70c2930dd58f (patch)
treeab50342f19f00448ccfbec87bfca15871e8f063e
parent6361b223707b8010f5699da7012710395390db76 (diff)
parenta43c1c1090e332212cbbae5e6c633e1b03c28acb (diff)
Merge pull request #268761 from wegank/wxformbuilder-bump
wxformbuilder: unstable-2023-04-21 -> 4.0.0
-rw-r--r--pkgs/development/tools/wxformbuilder/default.nix19
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix
index c8e05c1fc10bb..e8f888680bad8 100644
--- a/pkgs/development/tools/wxformbuilder/default.nix
+++ b/pkgs/development/tools/wxformbuilder/default.nix
@@ -11,20 +11,27 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wxformbuilder";
-  version = "unstable-2023-04-21";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "wxFormBuilder";
     repo = "wxFormBuilder";
-    rev = "f026a8e1a7f68e794638f637e53845f8f04869ef";
+    rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-48J8osSBb5x9b8MYWZ5QGF6rWgwtcJ0PLLAYViDr50M=";
+    leaveDotGit = true;
+    postFetch = ''
+      substituteInPlace $out/.git-properties \
+        --replace "\$Format:%h\$" "$(git -C $out rev-parse --short HEAD)" \
+        --replace "\$Format:%(describe)\$" "$(git -C $out rev-parse --short HEAD)"
+      rm -rf $out/.git
+    '';
+    hash = "sha256-Lqta+u9WVwUREsR7aH+2DJn0oM5QwlwRSBImuwNkmS4=";
   };
 
   postPatch = ''
-    substituteInPlace .git-properties \
-      --replace "\$Format:%h\$" "${builtins.substring 0 7 finalAttrs.src.rev}" \
-      --replace "\$Format:%(describe)\$" "${builtins.substring 0 7 finalAttrs.src.rev}"
+    substituteInPlace third_party/tinyxml2/cmake/tinyxml2.pc.in \
+      --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
+      --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
     sed -i '/fixup_bundle/d' cmake/macros.cmake
   '';