diff options
author | Tom Hall <tahall256@protonmail.ch> | 2018-08-18 19:18:32 +0100 |
---|---|---|
committer | Tom Hall <tahall256@protonmail.ch> | 2018-08-18 20:45:34 +0100 |
commit | 73ac45108a2dcd4e133e0abbede1dbf154c3f14b (patch) | |
tree | eae94ac82787a322ae983200f58e5ebd3f42e725 /pkgs/development/tools/qtcreator/default.nix | |
parent | 955f391e29ada1d3a0ca4b345dae7ddef64167ec (diff) | |
download | nixpkgs-73ac45108a2dcd4e133e0abbede1dbf154c3f14b.tar nixpkgs-73ac45108a2dcd4e133e0abbede1dbf154c3f14b.tar.gz nixpkgs-73ac45108a2dcd4e133e0abbede1dbf154c3f14b.tar.bz2 nixpkgs-73ac45108a2dcd4e133e0abbede1dbf154c3f14b.tar.lz nixpkgs-73ac45108a2dcd4e133e0abbede1dbf154c3f14b.tar.xz nixpkgs-73ac45108a2dcd4e133e0abbede1dbf154c3f14b.tar.zst nixpkgs-73ac45108a2dcd4e133e0abbede1dbf154c3f14b.zip |
qtcreator: enable on aarch64 and armv7
Patch (from https://bugreports.qt.io/browse/QTCREATORBUG-8107) to allow botan to build on arm.
Diffstat (limited to 'pkgs/development/tools/qtcreator/default.nix')
-rw-r--r-- | pkgs/development/tools/qtcreator/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 38d385d1d55..24191e3a129 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake makeWrapper ]; + patches = optional (stdenv.isAarch64 || stdenv.isAarch32) ./0001-Fix-Allow-qt-creator-to-build-on-arm-aarch32-and-aar.patch; + doCheck = true; enableParallelBuilding = true; @@ -55,6 +57,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.qt.io/Category:Tools::QtCreator; license = "LGPL"; maintainers = [ maintainers.akaWolf ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; }; } |