diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 557cd266f85e..bf59bf348ca8 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -1,30 +1,28 @@ -{ lib - -, stdenv -, fetchFromGitHub -, buildNpmPackage -, nix-update-script -, electron -, writeShellScriptBin -, makeWrapper -, copyDesktopItems -, giflib -, makeDesktopItem -, pkg-config -, pixman -, cairo -, pango -, npm-lockfile-fix -, overrideSDK -, darwin +{ + lib, + stdenv, + fetchFromGitHub, + buildNpmPackage, + nix-update-script, + electron, + writeShellScriptBin, + makeWrapper, + copyDesktopItems, + makeDesktopItem, + pkg-config, + pixman, + cairo, + pango, + npm-lockfile-fix, + overrideSDK, + darwin, }: let # fix for: https://github.com/NixOS/nixpkgs/issues/272156 - buildNpmPackage' = - buildNpmPackage.override { - stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; + buildNpmPackage' = buildNpmPackage.override { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; in buildNpmPackage' rec { pname = "bruno"; @@ -44,22 +42,25 @@ buildNpmPackage' rec { npmDepsHash = "sha256-157hm7h5FWuOuxoo6WTtlMPq5LcRZIsSt5NDg0pvim8="; npmFlags = [ "--legacy-peer-deps" ]; - nativeBuildInputs = [ - (writeShellScriptBin "phantomjs" "echo 2.1.1") - pkg-config - ] ++ lib.optionals (! stdenv.isDarwin) [ - makeWrapper - copyDesktopItems - ]; + nativeBuildInputs = + [ + (writeShellScriptBin "phantomjs" "echo 2.1.1") + pkg-config + ] + ++ lib.optionals (!stdenv.isDarwin) [ + makeWrapper + copyDesktopItems + ]; - buildInputs = [ - pixman - cairo - pango - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreText - giflib - ]; + buildInputs = + [ + pixman + cairo + pango + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.CoreText + ]; desktopItems = [ (makeDesktopItem { @@ -78,7 +79,15 @@ buildNpmPackage' rec { --replace-fail 'if [ "$1" == "snap" ]; then' 'exit 0; if [ "$1" == "snap" ]; then' ''; - ELECTRON_SKIP_BINARY_DOWNLOAD=1; + ELECTRON_SKIP_BINARY_DOWNLOAD = 1; + + # remove giflib dependency + npmRebuildFlags = [ "--ignore-scripts" ]; + preBuild = '' + substituteInPlace node_modules/canvas/binding.gyp \ + --replace-fail "'with_gif%': '