diff options
| author | Robert Scott <code@humanleg.org.uk> | 2024-04-01 21:28:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-01 21:28:57 +0100 |
| commit | 0333eeba321bc674dcae82b8393b964b6db814d8 (patch) | |
| tree | a049ac78ac986d1680535344259fc2e83848f245 | |
| parent | Merge pull request #298617 from itslychee/patch/jishaku-bin-bash (diff) | |
| parent | sanjuuni: add patch to build with c++17 (diff) | |
| download | nixpkgs-0333eeba321bc674dcae82b8393b964b6db814d8.tar.gz | |
Merge pull request #283809 from r-ryantm/auto-update/poco
poco: 1.12.5p2 -> 1.13.2
| -rw-r--r-- | pkgs/applications/networking/browsers/litebrowser/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/poco/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/graphics/sanjuuni/default.nix | 9 |
3 files changed, 15 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/litebrowser/default.nix b/pkgs/applications/networking/browsers/litebrowser/default.nix index d1ffce7e6e5e..0c2c2b2e9b3c 100644 --- a/pkgs/applications/networking/browsers/litebrowser/default.nix +++ b/pkgs/applications/networking/browsers/litebrowser/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { pname = "litebrowser"; - version = "unstable-2022-10-31"; + version = "unstable-2024-02-25"; src = fetchFromGitHub { owner = "litehtml"; repo = "litebrowser-linux"; - rev = "4654f8fb2d5e2deba7ac6223b6639341bd3b7eba"; - hash = "sha256-SvW1AOxLBLKqa+/2u2Zn+/t33ZzQHmqlcLRl6z0rK9U="; + rev = "8130cf50af90e07d201d43b934b5a57f7ed4e68d"; + hash = "sha256-L/pd4VypDfjLKfh+HLpc4um+POWGzGa4OOttudwJxyk="; fetchSubmodules = true; # litehtml submodule }; @@ -46,6 +46,7 @@ stdenv.mkDerivation { ''; meta = with lib; { + broken = stdenv.cc.isClang; # https://github.com/litehtml/litebrowser-linux/issues/19 description = "A simple browser based on the litehtml engine"; mainProgram = "litebrowser"; homepage = "https://github.com/litehtml/litebrowser-linux"; diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index 2358d19240a2..029767aaa608 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "poco"; - version = "1.12.5p2"; + version = "1.13.2"; src = fetchFromGitHub { owner = "pocoproject"; repo = "poco"; - sha256 = "sha256-UAseNOC9n+OooDl4E67qcndJ02fAgmp2d8Ii/IyPvhg="; + sha256 = "sha256-GcwkGiui9j9RzMQyEEmqq8dxWzKpv5xWxJgvJpSMdbw="; rev = "poco-${version}-release"; }; diff --git a/pkgs/tools/graphics/sanjuuni/default.nix b/pkgs/tools/graphics/sanjuuni/default.nix index 6b96e6ad5a92..70bc59f3eb40 100644 --- a/pkgs/tools/graphics/sanjuuni/default.nix +++ b/pkgs/tools/graphics/sanjuuni/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , ffmpeg , poco @@ -19,6 +20,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-wgtyrik4Z5AXd8MHkiMuxMpGh/xcEtNqivyhvL68aac="; }; + patches = [ + (fetchpatch { + name = "build-with-cxx17.patch"; + url = "https://github.com/MCJack123/sanjuuni/commit/f2164bc18935bcf63ee5b0a82087bc91f7fd258d.patch"; + hash = "sha256-ZmP+AmUV7fcIFqSA6e56Nt6u03leE9PX36g2z0nLswo="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; |