diff --git a/pkgs/by-name/pr/pragtical/package.nix b/pkgs/by-name/pr/pragtical/package.nix index c26d366ae150..3fe9236949a7 100644 --- a/pkgs/by-name/pr/pragtical/package.nix +++ b/pkgs/by-name/pr/pragtical/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cacert, meson, ninja, @@ -14,17 +13,18 @@ libzip, lua5_4, luajit, - mbedtls_2, + mbedtls, pcre2, sdl3, + sdl3-image, xz, zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "pragtical"; - version = "3.7.0"; - pluginManagerVersion = "1.4.0"; + version = "3.8.1"; + pluginManagerVersion = "1.4.7.1"; linenoiseRev = "e78e236c8d85c078fdd9fc4e1f08716058aa1a42"; src = fetchFromGitHub { @@ -50,18 +50,9 @@ stdenv.mkDerivation (finalAttrs: { find subprojects -type d -name .git -prune -execdir rm -r {} + ''; - hash = "sha256-oqXv08TvZWVRsSCX6V9oAGHkFS0hL/gm3tGdiivOI6Q="; + hash = "sha256-b4qbNkqwyu4Ofaz3hof8lheOKYoerA2hfKMSNsTpHVY="; }; - patches = [ - # https://github.com/pragtical/pragtical/pull/334 - (fetchpatch { - name = "fix-dirmonitor-backend-detection.patch"; - url = "https://github.com/pragtical/pragtical/commit/5cf26e1f6a491f28d761390309dd77a795bdae9d.patch"; - hash = "sha256-eD17ItcsyRTKn6jydyW3J2lFq/hl3qHUmQ2LC4LXKC0="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ @@ -79,14 +70,17 @@ stdenv.mkDerivation (finalAttrs: { libzip lua5_4 luajit - mbedtls_2 + mbedtls pcre2 sdl3 + sdl3-image xz zlib ]; - mesonFlags = [ "-Duse_system_lua=true" ]; + mesonFlags = [ + (lib.mesonBool "use_system_lua" true) + ]; meta = { changelog = "https://github.com/pragtical/pragtical/blob/${finalAttrs.src.rev}/changelog.md";