Merge pull request #30728 from pmiddend/awesomebump-5.1

awesomebump: 4.0 -> 5.1

1 files changed, 37 insertions, 24 deletions

diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index f1958ca35be..f190b421b05 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -1,36 +1,49 @@
-{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper }:
+{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }:
 
-stdenv.mkDerivation {
-  name = "awesomebump-4.0";
 
-  src = fetchurl {
-    url = https://github.com/kmkolasinski/AwesomeBump/archive/Linuxv4.0.tar.gz;
-    sha256 = "1rp4m4y2ld49hibzwqwy214cbiin80i882d9l0y1znknkdcclxf2";
+let
+  version = "5.1";
+
+  src = fetchgit {
+    url = "https://github.com/kmkolasinski/AwesomeBump.git";
+    rev = "Winx32v${version}";
+    sha256 = "1c8b9jki0v8kzkvsvyv7q1w3s7j40br6ph15hh2xi0a1mpwckq56";
+    fetchSubmodules = true;
   };
 
-  setSourceRoot = "sourceRoot=$(echo */Sources)";
+  qtnproperty = stdenv.mkDerivation {
+    name = "qtnproperty";
+    inherit src;
+    sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
+    buildInputs = [ qtscript qtbase qtdeclarative ];
+    nativeBuildInputs = [ qmake flex bison ];
+    postInstall = ''
+      install -D bin-linux/QtnPEG $out/bin/QtnPEG
+    '';
+  };
+in stdenv.mkDerivation rec {
+  name = "awesomebump-${version}";
 
-  nativeBuildInputs = [ makeWrapper qmake ];
-  buildInputs = [ qtbase ];
+  inherit src;
 
-  enableParallelBuilding = true;
+  buildInputs = [ qtbase qtscript qtdeclarative ];
 
-  installPhase =
-    ''
-      d=$out/libexec/AwesomeBump
-      mkdir -p $d $out/bin
-      cp AwesomeBump $d/
-      cp -prd ../Bin/Configs ../Bin/Core $d/
+  nativeBuildInputs = [ qmake makeWrapper ];
 
-      # AwesomeBump expects to find Core and Configs in its current
-      # directory.
-      makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
-        --run "cd $d"
-    '';
+  preBuild = ''
+    ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG
+  '';
+
+  postInstall = ''
+    d=$out/libexec/AwesomeBump
 
-  # RPATH in /tmp hack
-  preFixup = ''
-    rm -r $NIX_BUILD_TOP/__nix_qt5__
+    mkdir -p $d
+    cp -vr workdir/`cat workdir/current`/bin/AwesomeBump $d/
+    cp -prd Bin/Configs Bin/Core $d/
+
+    # AwesomeBump expects to find Core and Configs in its current directory.
+    makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
+        --run "cd $d"
   '';
 
   meta = {