Merge pull request #133428 from lf-/obs-aarch64

authored by Sandro and committed by GitHub d66e83d1 31dfd4ce

+44 -12
+15 -7
pkgs/applications/video/obs-studio/default.nix
··· 1 - { config, lib, stdenv 2 , mkDerivation 3 , fetchFromGitHub 4 , addOpenGLRunpath ··· 41 let 42 inherit (lib) optional optionals; 43 44 - in mkDerivation rec { 45 pname = "obs-studio"; 46 version = "27.0.0"; 47 ··· 61 ./Change-product_version-to-user_agent_product.patch 62 ]; 63 64 - nativeBuildInputs = [ addOpenGLRunpath cmake pkg-config ]; 65 66 buildInputs = [ 67 curl ··· 81 wayland 82 x264 83 libvlc 84 - makeWrapper 85 mbedtls 86 ] 87 - ++ optionals scriptingSupport [ luajit swig python3 ] 88 ++ optional alsaSupport alsa-lib 89 ++ optional pulseaudioSupport libpulseaudio 90 ++ optional pipewireSupport pipewire; ··· 132 ''; 133 homepage = "https://obsproject.com"; 134 maintainers = with maintainers; [ jb55 MP2E V ]; 135 - license = licenses.gpl2; 136 - platforms = [ "x86_64-linux" "i686-linux" ]; 137 }; 138 }
··· 1 + { config 2 + , lib 3 + , stdenv 4 , mkDerivation 5 , fetchFromGitHub 6 , addOpenGLRunpath ··· 43 let 44 inherit (lib) optional optionals; 45 46 + in 47 + mkDerivation rec { 48 pname = "obs-studio"; 49 version = "27.0.0"; 50 ··· 64 ./Change-product_version-to-user_agent_product.patch 65 ]; 66 67 + nativeBuildInputs = [ 68 + addOpenGLRunpath 69 + cmake 70 + pkg-config 71 + makeWrapper 72 + ] 73 + ++ optional scriptingSupport swig; 74 75 buildInputs = [ 76 curl ··· 90 wayland 91 x264 92 libvlc 93 mbedtls 94 ] 95 + ++ optionals scriptingSupport [ luajit python3 ] 96 ++ optional alsaSupport alsa-lib 97 ++ optional pulseaudioSupport libpulseaudio 98 ++ optional pipewireSupport pipewire; ··· 140 ''; 141 homepage = "https://obsproject.com"; 142 maintainers = with maintainers; [ jb55 MP2E V ]; 143 + license = licenses.gpl2Plus; 144 + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; 145 }; 146 }
+29 -5
pkgs/development/libraries/libcef/default.nix
··· 1 - { lib, stdenv, fetchurl, cmake 2 , glib 3 , nss 4 , nspr ··· 52 cups 53 libxshmfence 54 ]; 55 - in stdenv.mkDerivation rec { 56 pname = "cef-binary"; 57 version = "90.6.7"; 58 gitRevision = "19ba721"; 59 chromiumVersion = "90.0.4430.212"; 60 61 src = fetchurl { 62 - url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_linux64_minimal.tar.bz2"; 63 - sha256 = "1ja711x9fdlf21qw1k9xn3lvjc5zsfgnjga1w1r8sysam73jk7xj"; 64 }; 65 66 nativeBuildInputs = [ cmake ]; 67 makeFlags = [ "libcef_dll_wrapper" ]; 68 dontStrip = true; 69 dontPatchELF = true; ··· 83 homepage = "https://cef-builds.spotifycdn.com/index.html"; 84 maintainers = with maintainers; [ puffnfresh ]; 85 license = licenses.bsd3; 86 - platforms = with platforms; linux; 87 }; 88 }
··· 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , cmake 5 , glib 6 , nss 7 , nspr ··· 55 cups 56 libxshmfence 57 ]; 58 + platforms = { 59 + "aarch64-linux" = { 60 + platformStr = "linuxarm64"; 61 + projectArch = "arm64"; 62 + sha256 = "1j93qawh9h6k2ic70i10npppv5f9dch961lc1wxwsi68daq8r081"; 63 + }; 64 + "i686-linux" = { 65 + platformStr = "linux32"; 66 + projectArch = "x86"; 67 + sha256 = "0ki4zr8ih06kirgbpxbinv4baw3qvacx208q6qy1cvpfh6ll4fwb"; 68 + }; 69 + "x86_64-linux" = { 70 + platformStr = "linux64"; 71 + projectArch = "x86_64"; 72 + sha256 = "1ja711x9fdlf21qw1k9xn3lvjc5zsfgnjga1w1r8sysam73jk7xj"; 73 + }; 74 + }; 75 + 76 + platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; 77 + in 78 + stdenv.mkDerivation rec { 79 pname = "cef-binary"; 80 version = "90.6.7"; 81 gitRevision = "19ba721"; 82 chromiumVersion = "90.0.4430.212"; 83 84 src = fetchurl { 85 + url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; 86 + inherit (platformInfo) sha256; 87 }; 88 89 nativeBuildInputs = [ cmake ]; 90 + cmakeFlags = "-DPROJECT_ARCH=${platformInfo.projectArch}"; 91 makeFlags = [ "libcef_dll_wrapper" ]; 92 dontStrip = true; 93 dontPatchELF = true; ··· 107 homepage = "https://cef-builds.spotifycdn.com/index.html"; 108 maintainers = with maintainers; [ puffnfresh ]; 109 license = licenses.bsd3; 110 + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; 111 }; 112 }