diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix deleted file mode 100644 index 9c230a2984eb..000000000000 --- a/pkgs/applications/editors/scite/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2 }: - -stdenv.mkDerivation { - pname = "scite"; - version = "5.2.2"; - - src = fetchurl { - url = "https://www.scintilla.org/scite522.tgz"; - sha256 = "1q46clclx8r0b8zbq2zi89sygszgqf9ra5l83r2fs0ghvjgh2cxd"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk2 ]; - sourceRoot = "scintilla/gtk"; - - CXXFLAGS = [ - # GCC 13: error: 'intptr_t' does not name a type - "-include cstdint" - "-include system_error" - ]; - - buildPhase = '' - make - cd ../../lexilla/src - make - cd ../../scite/gtk - make prefix=$out/ - ''; - - installPhase = '' - make install prefix=$out/ - ''; - - meta = with lib; { - homepage = "https://www.scintilla.org/SciTE.html"; - description = "SCIntilla based Text Editor"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.rszibele ]; - mainProgram = "SciTE"; - }; -} diff --git a/pkgs/by-name/sc/scite/package.nix b/pkgs/by-name/sc/scite/package.nix new file mode 100644 index 000000000000..e8b2c0ba9b50 --- /dev/null +++ b/pkgs/by-name/sc/scite/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + wrapGAppsHook3, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "scite"; + version = "5.5.3"; + + src = fetchurl { + url = "https://www.scintilla.org/scite${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.tgz"; + hash = "sha256-MtXy8a4MzdJP8Rf6otc+Zu+KfYSJnmmXfBS8RVBBbOY="; + }; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; + + sourceRoot = "scite/gtk"; + + makeFlags = [ + "GTK3=1" + "prefix=${placeholder "out"}" + ]; + + CXXFLAGS = [ + # GCC 13: error: 'intptr_t' does not name a type + "-include cstdint" + "-include system_error" + ]; + + preBuild = '' + pushd ../../scintilla/gtk + make ''${makeFlags[@]} + popd + + pushd ../../lexilla/src + make ''${makeFlags[@]} + popd + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "https://www.scintilla.org/SciTE.html"; + description = "SCIntilla based Text Editor"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + rszibele + aleksana + ]; + mainProgram = "SciTE"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3e79e9f6989..008208e729f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32242,8 +32242,6 @@ with pkgs; sc-im = callPackage ../applications/misc/sc-im { }; - scite = callPackage ../applications/editors/scite { }; - scli = callPackage ../applications/misc/scli { }; scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { };