diff options
author | Renaud <c0bw3b@users.noreply.github.com> | 2018-11-08 22:59:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-08 22:59:17 +0100 |
commit | 4cd4f7a2c52231856e64ea1c19b2478b57c4c0c6 (patch) | |
tree | 1634d114e0055f81641e0f7ee26d09422eb76cd9 /pkgs/development/tools/build-managers/qbs/default.nix | |
parent | 530b4bcadd3228a82588911e248f7cffec74c0cc (diff) | |
download | nixpkgs-4cd4f7a2c52231856e64ea1c19b2478b57c4c0c6.tar nixpkgs-4cd4f7a2c52231856e64ea1c19b2478b57c4c0c6.tar.gz nixpkgs-4cd4f7a2c52231856e64ea1c19b2478b57c4c0c6.tar.bz2 nixpkgs-4cd4f7a2c52231856e64ea1c19b2478b57c4c0c6.tar.lz nixpkgs-4cd4f7a2c52231856e64ea1c19b2478b57c4c0c6.tar.xz nixpkgs-4cd4f7a2c52231856e64ea1c19b2478b57c4c0c6.tar.zst nixpkgs-4cd4f7a2c52231856e64ea1c19b2478b57c4c0c6.zip |
qbs: 1.8 -> 1.12.1
(#49869)
Diffstat (limited to 'pkgs/development/tools/build-managers/qbs/default.nix')
-rw-r--r-- | pkgs/development/tools/build-managers/qbs/default.nix | 32 |
1 files changed, 10 insertions, 22 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"; }; - enableParallelBuilding = true; - - buildInputs = with qt5; [ - qtbase - qtscript - ]; + nativeBuildInputs = [ qmake ]; - installFlags = [ "INSTALL_ROOT=$(out)" ]; + qmakeFlags = [ "QBS_INSTALL_PREFIX=$(out)" "qbs.pro" ]; - buildPhase = '' - # From http://doc.qt.io/qbs/building.html - qmake -r qbs.pro - make - ''; + buildInputs = [ qtbase qtscript ]; - postInstall = '' - mv $out/usr/local/* "$out" - ''; + enableParallelBuilding = true; 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; }; } |