diff options
| author | DwarfMaster <luc@dwarfmaster.net> | 2022-07-18 00:55:23 +0200 |
|---|---|---|
| committer | DwarfMaster <luc@dwarfmaster.net> | 2022-07-18 17:39:59 +0200 |
| commit | 016243550c631afe35e0e606a051f4425e342230 (patch) | |
| tree | 2691a7a141d0aae344b20a5bf44d80de4b7bde0d /pkgs/desktops | |
| parent | 3aa086b0f0ef1c7e7a8239326bdecb16bc1c3b7f (diff) | |
| download | nixpkgs-016243550c631afe35e0e606a051f4425e342230.tar nixpkgs-016243550c631afe35e0e606a051f4425e342230.tar.gz nixpkgs-016243550c631afe35e0e606a051f4425e342230.tar.bz2 nixpkgs-016243550c631afe35e0e606a051f4425e342230.tar.lz nixpkgs-016243550c631afe35e0e606a051f4425e342230.tar.xz nixpkgs-016243550c631afe35e0e606a051f4425e342230.tar.zst nixpkgs-016243550c631afe35e0e606a051f4425e342230.zip | |
arcan.arcan: 0.6.1.1 -> 0.6.2
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/arcan/arcan/clone-sources.nix | 16 | ||||
| -rw-r--r-- | pkgs/desktops/arcan/arcan/default.nix | 20 |
2 files changed, 24 insertions, 12 deletions
diff --git a/pkgs/desktops/arcan/arcan/clone-sources.nix b/pkgs/desktops/arcan/arcan/clone-sources.nix index c7c6bebb704..bd39c0843a8 100644 --- a/pkgs/desktops/arcan/arcan/clone-sources.nix +++ b/pkgs/desktops/arcan/arcan/clone-sources.nix @@ -3,23 +3,23 @@ letoram-openal-src = fetchFromGitHub { owner = "letoram"; repo = "openal"; - rev = "1c7302c580964fee9ee9e1d89ff56d24f934bdef"; - hash = "sha256-InqU59J0zvwJ20a7KU54xTM7d76VoOlFbtj7KbFlnTU="; + rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a"; + sha256 = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420="; }; freetype-src = fetchgit { url = "git://git.sv.nongnu.org/freetype/freetype2.git"; - rev = "94cb3a2eb96b3f17a1a3bd0e6f7da97c0e1d8f57"; - sha256 = "sha256-LzjqunX/T8khF2UjPlPYiQOwMGem8MqPYneR2LdZ5Fg="; + rev = "275b116b40c9d183d42242099ea9ff276985855b"; + sha256 = "sha256-YVyJttaXt19MSuD0pmazwxNKz65jcqqWvIgmDj4d3MA="; }; libuvc-src = fetchFromGitHub { owner = "libuvc"; repo = "libuvc"; - rev = "b2b01ae6a2875d05c99eb256bb15815018d6e837"; - sha256 = "sha256-2zCTjyodRARkHM/Q0r4bdEH9LO1Z9xPCnY2xE4KZddA="; + rev = "a4de53e7e265f8c6a64df7ccd289f318104e1916"; + hash = "sha256-a+Q0PTV4ujGnX55u49VJfMgQljZunZYRvkR0tIkGnHI="; }; luajit-src = fetchgit { url = "https://luajit.org/git/luajit-2.0.git"; - rev = "d3294fa63b344173db68dd612c6d3801631e28d4"; - sha256 = "sha256-1iHBXcbYhWN4M8g5oH09S1j1WrjYzI6qcRbHsdfpRkk="; + rev = "899093a9e0fa5b16f27016381ef4b15529dadff2"; + sha256 = "sha256-bCi1ms78HCOOgStIY2tSGM9LUEX3qnwadLLeYWWu1KI="; }; } diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix index a15d5ac6be9..9623a47807d 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/desktops/arcan/arcan/default.nix @@ -8,7 +8,10 @@ , ffmpeg , file , freetype +, glib +, gumbo , harfbuzz +, jbig2dec , leptonica , libGL , libX11 @@ -24,11 +27,14 @@ , libvncserver , libxcb , libxkbcommon -, lua +, lua5_1 , luajit , makeWrapper , mesa +, mupdf , openal +, openjpeg +, pcre , pkg-config , sqlite , tesseract @@ -48,13 +54,13 @@ stdenv.mkDerivation rec { pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal"; - version = "0.6.1.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; rev = version; - hash = "sha256-+dJaBSKGbHOwzA26/jDyh2UF9YRwGUcysJIeAM4kvfc="; + hash = "sha256-Qwyt927eLqaCqJ4Lo4J1lQX2A24ke+AH52rmSCTnpO0="; }; nativeBuildInputs = [ @@ -71,7 +77,10 @@ stdenv.mkDerivation rec { ffmpeg file freetype + glib + gumbo harfbuzz + jbig2dec leptonica libGL libX11 @@ -87,10 +96,13 @@ stdenv.mkDerivation rec { libvncserver libxcb libxkbcommon - lua + lua5_1 luajit mesa + mupdf.dev openal + openjpeg.dev + pcre sqlite tesseract valgrind |