summary refs log tree commit diff
diff options
context:
space:
mode:
authorrewine <lhongxu@outlook.com>2023-07-25 20:20:02 +0800
committerrewine <lhongxu@outlook.com>2023-07-25 20:20:02 +0800
commit9a7e9b077ef14cb67d64387caf5058b5af609dab (patch)
tree084d5d5d34e1643d58bcd97be6b7bc682e4f9e51
parentad566c449da2ea56ce9d6c3f07c9c9fd19267240 (diff)
downloadnixpkgs-9a7e9b077ef14cb67d64387caf5058b5af609dab.tar
nixpkgs-9a7e9b077ef14cb67d64387caf5058b5af609dab.tar.gz
nixpkgs-9a7e9b077ef14cb67d64387caf5058b5af609dab.tar.bz2
nixpkgs-9a7e9b077ef14cb67d64387caf5058b5af609dab.tar.lz
nixpkgs-9a7e9b077ef14cb67d64387caf5058b5af609dab.tar.xz
nixpkgs-9a7e9b077ef14cb67d64387caf5058b5af609dab.tar.zst
nixpkgs-9a7e9b077ef14cb67d64387caf5058b5af609dab.zip
qtcreator-qt5: remove
-rw-r--r--pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch15
-rw-r--r--pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch12
-rw-r--r--pkgs/development/tools/qtcreator/default.nix96
-rw-r--r--pkgs/top-level/all-packages.nix4
4 files changed, 0 insertions, 127 deletions
diff --git a/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch b/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch
deleted file mode 100644
index f0e8c3d2c5e..00000000000
--- a/pkgs/development/tools/qtcreator/0001-Fix-clang-libcpp-regexp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp
-index b656f8e1..a830d3c3 100644
---- a/src/plugins/cpptools/headerpathfilter.cpp
-+++ b/src/plugins/cpptools/headerpathfilter.cpp
-@@ -124,8 +124,8 @@ HeaderPaths::iterator resourceIterator(HeaderPaths &headerPaths)
- {
-     // include/c++, include/g++, libc++\include and libc++abi\include
-     static const QString cppIncludes = R"((.*/include/.*(g\+\+|c\+\+).*))"
--                                       R"(|(.*libc\+\+/include))"
--                                       R"(|(.*libc\+\+abi/include))"
-+                                       R"(|(.*libc\+\+.*\/include))"
-+                                       R"(|(.*libc\+\+abi.*\/include))";
-                                        R"(|(/usr/local/include))";
-     static const QRegularExpression includeRegExp("\\A(" + cppIncludes + ")\\z");
- 
diff --git a/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch b/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch
deleted file mode 100644
index b0427e94c7c..00000000000
--- a/pkgs/development/tools/qtcreator/0002-Dont-remove-clang-header-paths.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/plugins/cpptools/headerpathfilter.cpp b/src/plugins/cpptools/headerpathfilter.cpp
-index a830d3c3..80e2f933 100644
---- a/src/plugins/cpptools/headerpathfilter.cpp
-+++ b/src/plugins/cpptools/headerpathfilter.cpp
-@@ -157,7 +157,6 @@ void removeClangSystemHeaderPaths(HeaderPaths &headerPaths)
- 
- void HeaderPathFilter::tweakHeaderPaths()
- {
--    removeClangSystemHeaderPaths(builtInHeaderPaths);
-     removeGccInternalIncludePaths();
- 
-     auto split = resourceIterator(builtInHeaderPaths);
diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
deleted file mode 100644
index 5072bb88f4b..00000000000
--- a/pkgs/development/tools/qtcreator/default.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-{ mkDerivation, lib, fetchurl, fetchgit, fetchpatch
-, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8, elfutils, perf
-, withDocumentation ? false, withClangPlugins ? true
-}:
-
-let
-  # Fetch clang from qt vendor, this contains submodules like this:
-  # clang<-clang-tools-extra<-clazy.
-  clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: {
-    # file RPATH_CHANGE could not write new RPATH
-    cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ];
-    src = fetchgit {
-      url = "https://code.qt.io/clang/clang.git";
-      rev = "c12b012bb7465299490cf93c2ae90499a5c417d5";
-      sha256 = "0mgmnazgr19hnd03xcrv7d932j6dpz88nhhx008b0lv4bah9mqm0";
-    };
-    unpackPhase = "";
-  });
-in
-
-mkDerivation rec {
-  pname = "qtcreator";
-  version = "5.0.3";
-  baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version));
-
-  src = fetchurl {
-    url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz";
-    sha256 = "1sz21ijzvhf5avblikffykbqa8zdq3sbg32g2dmyxv5w211v3lvz";
-  };
-
-  buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative elfutils.dev ] ++
-    lib.optionals withClangPlugins [ llvmPackages_8.libclang
-                                 clang_qt_vendor
-                                 llvmPackages_8.llvm ];
-
-  nativeBuildInputs = [ qmake ];
-
-  # 0001-Fix-clang-libcpp-regexp.patch is for fixing regexp that is used to
-  # find clang libc++ library include paths. By default it's not covering paths
-  # like libc++-version, which is default name for libc++ folder in nixos.
-  # ./0002-Dont-remove-clang-header-paths.patch is for forcing qtcreator to not
-  # remove system clang include paths.
-  patches = [ ./0001-Fix-clang-libcpp-regexp.patch
-              ./0002-Dont-remove-clang-header-paths.patch ];
-
-  doCheck = true;
-
-  buildFlags = lib.optional withDocumentation "docs";
-
-  installFlags = [ "INSTALL_ROOT=$(out)" ] ++ lib.optional withDocumentation "install_docs";
-
-  qtWrapperArgs = [ "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" ];
-
-  preConfigure = ''
-    substituteInPlace src/plugins/plugins.pro \
-      --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
-    substituteInPlace src/libs/libs.pro \
-      --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
-    '' + lib.optionalString withClangPlugins ''
-    # Fix paths for llvm/clang includes directories.
-    substituteInPlace src/shared/clang/clang_defines.pri \
-      --replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \
-      --replace '$$clean_path($${LLVM_BINDIR})' '${clang_qt_vendor}/bin'
-
-    # Fix paths to libclang library.
-    substituteInPlace src/shared/clang/clang_installation.pri \
-      --replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang.lib}/lib' \
-      --replace 'LIBCLANG_LIBS += $${CLANG_LIB}' 'LIBCLANG_LIBS += -lclang' \
-      --replace 'LIBTOOLING_LIBS = -L$${LLVM_LIBDIR}' 'LIBTOOLING_LIBS = -L${clang_qt_vendor}/lib' \
-      --replace 'LLVM_CXXFLAGS ~= s,-gsplit-dwarf,' '${lib.concatStringsSep "\n" ["LLVM_CXXFLAGS ~= s,-gsplit-dwarf," "    LLVM_CXXFLAGS += -fno-rtti"]}'
-  '';
-
-  preBuild = lib.optionalString withDocumentation ''
-    ln -s ${lib.getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share
-  '';
-
-  postInstall = ''
-    mkdir -p $out/share/applications
-    cp share/applications/org.qt-project.qtcreator.desktop $out/share/applications
-    substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \
-      --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator"
-  '';
-
-  meta = {
-    description = "Cross-platform IDE tailored to the needs of Qt developers";
-    longDescription = ''
-      Qt Creator is a cross-platform IDE (integrated development environment)
-      tailored to the needs of Qt developers. It includes features such as an
-      advanced code editor, a visual debugger and a GUI designer.
-    '';
-    homepage = "https://wiki.qt.io/Category:Tools::QtCreator";
-    license = "LGPL";
-    maintainers = [ lib.maintainers.akaWolf ];
-    platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2185766a092..7339fc2eca6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19607,10 +19607,6 @@ with pkgs;
 
   qc = callPackage ../development/tools/qc { };
 
-  qtcreator = libsForQt5.callPackage ../development/tools/qtcreator {
-    inherit (linuxPackages) perf;
-  };
-
   qtcreator-qt6 = qt6Packages.callPackage ../development/tools/qtcreator/qt6.nix {
     inherit (linuxPackages) perf;
     stdenv = llvmPackages_14.stdenv;