Merge pull request #295343 from mattpolzin/bruno-1-10_2

bruno: 1.8.0 -> 1.10.0

authored by Thiago Kenji Okada and committed by GitHub 9140731e 7960697f

+15 -4
+15 -4
pkgs/by-name/br/bruno/package.nix
··· 14 , cairo 15 , pango 16 , npm-lockfile-fix 17 }: 18 19 - buildNpmPackage rec { 20 pname = "bruno"; 21 - version = "1.8.0"; 22 23 src = fetchFromGitHub { 24 owner = "usebruno"; 25 repo = "bruno"; 26 rev = "v${version}"; 27 - hash = "sha256-STWGZzFtU3UpctgNz3m96JyfSRzHy2ZZQPr8R+zpDgM="; 28 29 postFetch = '' 30 ${lib.getExe npm-lockfile-fix} $out/package-lock.json 31 ''; 32 }; 33 34 - npmDepsHash = "sha256-0Uac4Q3EYiTkg6RFuwR+saXiVm7jISyZBjkN30uYnnE="; 35 npmFlags = [ "--legacy-peer-deps" ]; 36 37 nativeBuildInputs = [ ··· 46 pixman 47 cairo 48 pango 49 ]; 50 51 desktopItems = [
··· 14 , cairo 15 , pango 16 , npm-lockfile-fix 17 + , overrideSDK 18 + , darwin 19 }: 20 21 + let 22 + # fix for: https://github.com/NixOS/nixpkgs/issues/272156 23 + buildNpmPackage' = 24 + buildNpmPackage.override { 25 + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; 26 + }; 27 + in 28 + buildNpmPackage' rec { 29 pname = "bruno"; 30 + version = "1.10.0"; 31 32 src = fetchFromGitHub { 33 owner = "usebruno"; 34 repo = "bruno"; 35 rev = "v${version}"; 36 + hash = "sha256-wxQaKewKIfN93Wvb7WmOSuflTgfk1XKvHAA1UIVyMqk="; 37 38 postFetch = '' 39 ${lib.getExe npm-lockfile-fix} $out/package-lock.json 40 ''; 41 }; 42 43 + npmDepsHash = "sha256-IXFFOegzJbDcQejqQsAg11jDnhSKi27Olm8m3qr7bqw="; 44 npmFlags = [ "--legacy-peer-deps" ]; 45 46 nativeBuildInputs = [ ··· 55 pixman 56 cairo 57 pango 58 + ] ++ lib.optionals stdenv.isDarwin [ 59 + darwin.apple_sdk_11_0.frameworks.CoreText 60 ]; 61 62 desktopItems = [