public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qbs: 1.8 -> 1.12.1

Browse Source 
(#49869)
This commit is contained in:
Renaud 2018-11-08 22:59:17 +01:00 committed by GitHub
parent 530b4bcadd
commit 4cd4f7a2c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/development/tools/build-managers/qbs/default.nix
View File

@ -1,41 +1,29 @@
{ stdenv, qt5, fetchFromGitHub }: { stdenv, fetchFromGitHub, qmake, qtbase, qtscript }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qbs-${version}"; name = "qbs-${version}";
version = "1.8"; version = "1.12.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qt-labs"; owner = "qbs";
repo = "qbs"; repo = "qbs";
rev = "fa9c21d6908e0dad805113f570ac883c1dc5067a"; rev = "v${version}";
sha256 = "1manriz75rav1vldkk829yk1la9md4m872l5ykl9m982i9801d9g"; sha256 = "14b7bz07yfrmbry57n3xh8w4nbapm6aknk45fgi7ljvsfzp85fzl";
}; };
nativeBuildInputs = [ qmake ];
qmakeFlags = [ "QBS_INSTALL_PREFIX=$(out)" "qbs.pro" ];
buildInputs = [ qtbase qtscript ];
enableParallelBuilding = true; 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; { meta = with stdenv.lib; {
description = "A tool that helps simplify the build process for developing projects across multiple platforms"; 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 ]; maintainers = with maintainers; [ expipiplus1 ];
inherit version;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -11849,7 +11849,7 @@ with pkgs;
re2 = callPackage ../development/libraries/re2 { }; 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 = callPackage ../development/libraries/qca2 { qt = qt4; };
qca2-qt5 = qca2.override { qt = qt5.qtbase; }; qca2-qt5 = qca2.override { qt = qt5.qtbase; };