diff options
Diffstat (limited to 'pkgs/applications/editors/geany/default.nix')
| -rw-r--r-- | pkgs/applications/editors/geany/default.nix | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 4ecc511b654..517b2ca4fe7 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -7,20 +7,27 @@ , file , libintl , hicolor-icon-theme +, python3 , wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geany"; - version = "1.38"; + version = "2.0"; outputs = [ "out" "dev" "doc" "man" ]; src = fetchurl { - url = "https://download.geany.org/${pname}-${version}.tar.bz2"; - sha256 = "abff176e4d48bea35ee53037c49c82f90b6d4c23e69aed6e4a5ca8ccd3aad546"; + url = "https://download.geany.org/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; + hash = "sha256-VltM0vAxHB46Fn7HHEoy26ZC4P5VSuW7a4F3t6dMzJI="; }; + patches = [ + # The test runs into UB in headless environments and crashes at least on headless Darwin. + # Remove if https://github.com/geany/geany/pull/3676 is merged (or the issue fixed otherwise). + ./disable-test-sidebar.patch + ]; + nativeBuildInputs = [ pkg-config intltool @@ -28,6 +35,7 @@ stdenv.mkDerivation rec { which file hicolor-icon-theme + python3 wrapGAppsHook ]; @@ -35,6 +43,11 @@ stdenv.mkDerivation rec { gtk3 ]; + preCheck = '' + patchShebangs --build tests/ctags/runner.sh + patchShebangs --build scripts + ''; + doCheck = true; enableParallelBuilding = true; @@ -61,9 +74,9 @@ stdenv.mkDerivation rec { - Plugin interface ''; homepage = "https://www.geany.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ frlan ]; platforms = platforms.all; mainProgram = "geany"; }; -} +}) |