pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #181961 from dwarfmaster/arcan-0.6.2

arcan.arcan: 0.6.1.1 -> 0.6.2

authored by Mario Rodas and committed by GitHub 516a2c46 c3d537d7

+24 -12
unified split
+8 -8
pkgs/desktops/arcan/arcan/clone-sources.nix
··· 3 letoram-openal-src = fetchFromGitHub { 4 owner = "letoram"; 5 repo = "openal"; 6 - rev = "1c7302c580964fee9ee9e1d89ff56d24f934bdef"; 7 - hash = "sha256-InqU59J0zvwJ20a7KU54xTM7d76VoOlFbtj7KbFlnTU="; 8 }; 9 freetype-src = fetchgit { 10 url = "git://git.sv.nongnu.org/freetype/freetype2.git"; 11 - rev = "94cb3a2eb96b3f17a1a3bd0e6f7da97c0e1d8f57"; 12 - sha256 = "sha256-LzjqunX/T8khF2UjPlPYiQOwMGem8MqPYneR2LdZ5Fg="; 13 }; 14 libuvc-src = fetchFromGitHub { 15 owner = "libuvc"; 16 repo = "libuvc"; 17 - rev = "b2b01ae6a2875d05c99eb256bb15815018d6e837"; 18 - sha256 = "sha256-2zCTjyodRARkHM/Q0r4bdEH9LO1Z9xPCnY2xE4KZddA="; 19 }; 20 luajit-src = fetchgit { 21 url = "https://luajit.org/git/luajit-2.0.git"; 22 - rev = "d3294fa63b344173db68dd612c6d3801631e28d4"; 23 - sha256 = "sha256-1iHBXcbYhWN4M8g5oH09S1j1WrjYzI6qcRbHsdfpRkk="; 24 }; 25 }
··· 3 letoram-openal-src = fetchFromGitHub { 4 owner = "letoram"; 5 repo = "openal"; 6 + rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a"; 7 + sha256 = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420="; 8 }; 9 freetype-src = fetchgit { 10 url = "git://git.sv.nongnu.org/freetype/freetype2.git"; 11 + rev = "275b116b40c9d183d42242099ea9ff276985855b"; 12 + sha256 = "sha256-YVyJttaXt19MSuD0pmazwxNKz65jcqqWvIgmDj4d3MA="; 13 }; 14 libuvc-src = fetchFromGitHub { 15 owner = "libuvc"; 16 repo = "libuvc"; 17 + rev = "a4de53e7e265f8c6a64df7ccd289f318104e1916"; 18 + hash = "sha256-a+Q0PTV4ujGnX55u49VJfMgQljZunZYRvkR0tIkGnHI="; 19 }; 20 luajit-src = fetchgit { 21 url = "https://luajit.org/git/luajit-2.0.git"; 22 + rev = "899093a9e0fa5b16f27016381ef4b15529dadff2"; 23 + sha256 = "sha256-bCi1ms78HCOOgStIY2tSGM9LUEX3qnwadLLeYWWu1KI="; 24 }; 25 }
+16 -4
pkgs/desktops/arcan/arcan/default.nix
··· 8 , ffmpeg 9 , file 10 , freetype 11 , harfbuzz 12 , leptonica 13 , libGL 14 , libX11 ··· 24 , libvncserver 25 , libxcb 26 , libxkbcommon 27 - , lua 28 , luajit 29 , makeWrapper 30 , mesa 31 , openal 32 , pkg-config 33 , sqlite 34 , tesseract ··· 48 49 stdenv.mkDerivation rec { 50 pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal"; 51 - version = "0.6.1.1"; 52 53 src = fetchFromGitHub { 54 owner = "letoram"; 55 repo = "arcan"; 56 rev = version; 57 - hash = "sha256-+dJaBSKGbHOwzA26/jDyh2UF9YRwGUcysJIeAM4kvfc="; 58 }; 59 60 nativeBuildInputs = [ ··· 71 ffmpeg 72 file 73 freetype 74 harfbuzz 75 leptonica 76 libGL 77 libX11 ··· 87 libvncserver 88 libxcb 89 libxkbcommon 90 - lua 91 luajit 92 mesa 93 openal 94 sqlite 95 tesseract 96 valgrind
··· 8 , ffmpeg 9 , file 10 , freetype 11 + , glib 12 + , gumbo 13 , harfbuzz 14 + , jbig2dec 15 , leptonica 16 , libGL 17 , libX11 ··· 27 , libvncserver 28 , libxcb 29 , libxkbcommon 30 + , lua5_1 31 , luajit 32 , makeWrapper 33 , mesa 34 + , mupdf 35 , openal 36 + , openjpeg 37 + , pcre 38 , pkg-config 39 , sqlite 40 , tesseract ··· 54 55 stdenv.mkDerivation rec { 56 pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal"; 57 + version = "0.6.2"; 58 59 src = fetchFromGitHub { 60 owner = "letoram"; 61 repo = "arcan"; 62 rev = version; 63 + hash = "sha256-Qwyt927eLqaCqJ4Lo4J1lQX2A24ke+AH52rmSCTnpO0="; 64 }; 65 66 nativeBuildInputs = [ ··· 77 ffmpeg 78 file 79 freetype 80 + glib 81 + gumbo 82 harfbuzz 83 + jbig2dec 84 leptonica 85 libGL 86 libX11 ··· 96 libvncserver 97 libxcb 98 libxkbcommon 99 + lua5_1 100 luajit 101 mesa 102 + mupdf.dev 103 openal 104 + openjpeg.dev 105 + pcre 106 sqlite 107 tesseract 108 valgrind