From 4cd4f7a2c52231856e64ea1c19b2478b57c4c0c6 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Thu, 8 Nov 2018 22:59:17 +0100
Subject: [PATCH] qbs: 1.8 -> 1.12.1

(#49869)
---
 .../tools/build-managers/qbs/default.nix      | 36 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/tools/build-managers/qbs/default.nix b/pkgs/development/tools/build-managers/qbs/default.nix
index dc2d545a765..99fb9090c0d 100644
--- a/pkgs/development/tools/build-managers/qbs/default.nix
+++ b/pkgs/development/tools/build-managers/qbs/default.nix
@@ -1,41 +1,29 @@
-{ stdenv, qt5, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, qmake, qtbase, qtscript }:
 
 stdenv.mkDerivation rec {
   name = "qbs-${version}";
 
-  version = "1.8";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
-    owner = "qt-labs";
+    owner = "qbs";
     repo = "qbs";
-    rev = "fa9c21d6908e0dad805113f570ac883c1dc5067a";
-    sha256 = "1manriz75rav1vldkk829yk1la9md4m872l5ykl9m982i9801d9g";
+    rev = "v${version}";
+    sha256 = "14b7bz07yfrmbry57n3xh8w4nbapm6aknk45fgi7ljvsfzp85fzl";
   };
 
+  nativeBuildInputs = [ qmake ];
+
+  qmakeFlags = [ "QBS_INSTALL_PREFIX=$(out)" "qbs.pro" ];
+
+  buildInputs = [ qtbase qtscript ];
+
   enableParallelBuilding = true;
 
-  buildInputs = with qt5; [
-    qtbase
-    qtscript
-  ];
-
-  installFlags = [ "INSTALL_ROOT=$(out)" ];
-
-  buildPhase = ''
-    # From http://doc.qt.io/qbs/building.html
-    qmake -r qbs.pro
-    make
-  '';
-
-  postInstall = ''
-    mv $out/usr/local/* "$out"
-  '';
-
   meta = with stdenv.lib; {
     description = "A tool that helps simplify the build process for developing projects across multiple platforms";
-    license = licenses.lgpl21;
+    license = licenses.lgpl3;
     maintainers = with maintainers; [ expipiplus1 ];
-    inherit version;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 505d2313852..76414156f4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11849,7 +11849,7 @@ with pkgs;
 
   re2 = callPackage ../development/libraries/re2 { };
 
-  qbs = callPackage ../development/tools/build-managers/qbs { };
+  qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { };
 
   qca2 = callPackage ../development/libraries/qca2 { qt = qt4; };
   qca2-qt5 = qca2.override { qt = qt5.qtbase; };