Unverified Commit b9642914 authored by K900's avatar K900 Committed by GitHub
Browse files

{buildFHSEnvBubblewrap,buildFHSEnvChroot}: add `nativeBuildInputs` (#344516)

parents 0eed89c8 4cb379f4

pkgs/applications/audio/cider/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -9,10 +9,11 @@ appimageTools.wrapType2 rec { 
    sha256 = "sha256-NwoV1eeAN0u9VXWpu5mANXhmgqe8u3h7BlsREP1f/pI=";

  };



  nativeBuildInputs = [ makeWrapper ];



  extraInstallCommands =

    let contents = appimageTools.extract { inherit pname version src; };

    in ''

      source "${makeWrapper}/nix-support/setup-hook"

      wrapProgram $out/bin/${pname} \

        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"

pkgs/applications/blockchains/framesh/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -14,13 +14,12 @@ let 
in

appimageTools.wrapType2 {

  inherit pname version src;

  nativeBuildInputs = [ makeWrapper ];



  extraInstallCommands = ''

    install -m 444 -D ${appimageContents}/frame.desktop $out/share/applications/frame.desktop

    install -m 444 -D ${appimageContents}/frame.png \

      $out/share/icons/hicolor/512x512/apps/frame.png



    source "${makeWrapper}/nix-support/setup-hook"

    wrapProgram "$out/bin/${pname}" \

       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"

pkgs/applications/blockchains/ledger-live-desktop/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -16,13 +16,14 @@ in 
appimageTools.wrapType2 rec {

  inherit pname version src;



  nativeBuildInputs = [ makeWrapper ];



  extraInstallCommands = ''

    install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop

    install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png

    ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png

    install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png



    source "${makeWrapper}/nix-support/setup-hook"

    wrapProgram "$out/bin/${pname}" \

       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}"

pkgs/applications/misc/joplin-desktop/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -44,13 +44,13 @@ let 


  linux = appimageTools.wrapType2 rec {

    inherit pname version src meta;

    nativeBuildInputs = [ makeWrapper ];



    profile = ''

      export LC_ALL=C.UTF-8

    '';



    extraInstallCommands = ''

      source "${makeWrapper}/nix-support/setup-hook"

      wrapProgram $out/bin/${pname} \

        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}"

      install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications

pkgs/applications/misc/notable/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ appimageTools.wrapType2 rec { 
    export LC_ALL=C.UTF-8

  '';



  nativeBuildInputs = [ makeWrapper ];



  extraPkgs = pkgs: [ pkgs.at-spi2-atk pkgs.at-spi2-core ];



  extraInstallCommands = ''
@@ -30,7 +32,6 @@ appimageTools.wrapType2 rec { 
      $out/share/icons/hicolor/1024x1024/apps/notable.png

    substituteInPlace $out/share/applications/notable.desktop \

      --replace 'Exec=AppRun' 'Exec=${pname}'

    source "${makeWrapper}/nix-support/setup-hook"

    wrapProgram "$out/bin/${pname}" \

      --add-flags "--disable-seccomp-filter-sandbox"

  '';