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

authored by

K900 and committed by
GitHub
b9642914 0eed89c8

+38 -20
+2 -1
pkgs/applications/audio/cider/default.nix
··· 9 9 sha256 = "sha256-NwoV1eeAN0u9VXWpu5mANXhmgqe8u3h7BlsREP1f/pI="; 10 10 }; 11 11 12 + nativeBuildInputs = [ makeWrapper ]; 13 + 12 14 extraInstallCommands = 13 15 let contents = appimageTools.extract { inherit pname version src; }; 14 16 in '' 15 - source "${makeWrapper}/nix-support/setup-hook" 16 17 wrapProgram $out/bin/${pname} \ 17 18 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" 18 19
+1 -2
pkgs/applications/blockchains/framesh/default.nix
··· 14 14 in 15 15 appimageTools.wrapType2 { 16 16 inherit pname version src; 17 + nativeBuildInputs = [ makeWrapper ]; 17 18 18 19 extraInstallCommands = '' 19 20 install -m 444 -D ${appimageContents}/frame.desktop $out/share/applications/frame.desktop 20 21 install -m 444 -D ${appimageContents}/frame.png \ 21 22 $out/share/icons/hicolor/512x512/apps/frame.png 22 - 23 - source "${makeWrapper}/nix-support/setup-hook" 24 23 wrapProgram "$out/bin/${pname}" \ 25 24 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" 26 25
+2 -1
pkgs/applications/blockchains/ledger-live-desktop/default.nix
··· 16 16 appimageTools.wrapType2 rec { 17 17 inherit pname version src; 18 18 19 + nativeBuildInputs = [ makeWrapper ]; 20 + 19 21 extraInstallCommands = '' 20 22 install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop 21 23 install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png 22 24 ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png 23 25 install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png 24 26 25 - source "${makeWrapper}/nix-support/setup-hook" 26 27 wrapProgram "$out/bin/${pname}" \ 27 28 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" 28 29
+1 -1
pkgs/applications/misc/joplin-desktop/default.nix
··· 44 44 45 45 linux = appimageTools.wrapType2 rec { 46 46 inherit pname version src meta; 47 + nativeBuildInputs = [ makeWrapper ]; 47 48 48 49 profile = '' 49 50 export LC_ALL=C.UTF-8 50 51 ''; 51 52 52 53 extraInstallCommands = '' 53 - source "${makeWrapper}/nix-support/setup-hook" 54 54 wrapProgram $out/bin/${pname} \ 55 55 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" 56 56 install -Dm444 ${appimageContents}/@joplinapp-desktop.desktop -t $out/share/applications
+2 -1
pkgs/applications/misc/notable/default.nix
··· 22 22 export LC_ALL=C.UTF-8 23 23 ''; 24 24 25 + nativeBuildInputs = [ makeWrapper ]; 26 + 25 27 extraPkgs = pkgs: [ pkgs.at-spi2-atk pkgs.at-spi2-core ]; 26 28 27 29 extraInstallCommands = '' ··· 30 32 $out/share/icons/hicolor/1024x1024/apps/notable.png 31 33 substituteInPlace $out/share/applications/notable.desktop \ 32 34 --replace 'Exec=AppRun' 'Exec=${pname}' 33 - source "${makeWrapper}/nix-support/setup-hook" 34 35 wrapProgram "$out/bin/${pname}" \ 35 36 --add-flags "--disable-seccomp-filter-sandbox" 36 37 '';
+2 -1
pkgs/applications/misc/zettlr/generic.nix
··· 26 26 pkgs.pandoc 27 27 ]; 28 28 29 + nativeBuildInputs = [ makeWrapper ]; 30 + 29 31 extraInstallCommands = '' 30 - source "${makeWrapper}/nix-support/setup-hook" 31 32 wrapProgram $out/bin/zettlr \ 32 33 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" 33 34 install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
+2 -1
pkgs/applications/networking/cluster/lens/linux.nix
··· 9 9 appimageTools.wrapType2 { 10 10 inherit pname version src meta; 11 11 12 + nativeBuildInputs = [ makeWrapper ]; 13 + 12 14 extraInstallCommands = 13 15 '' 14 - source "${makeWrapper}/nix-support/setup-hook" 15 16 wrapProgram $out/bin/${pname} \ 16 17 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" 17 18 install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
+2 -1
pkgs/applications/video/losslesscut-bin/build-from-appimage.nix
··· 22 22 appimageTools.wrapType2 { 23 23 inherit pname version src; 24 24 25 + nativeBuildInputs = [ makeWrapper ]; 26 + 25 27 profile = '' 26 28 export LC_ALL=C.UTF-8 27 29 ''; ··· 38 40 cp ${extracted}/losslesscut.desktop $out/share/applications 39 41 substituteInPlace $out/share/applications/losslesscut.desktop \ 40 42 --replace AppRun losslesscut 41 - source "${makeWrapper}/nix-support/setup-hook" 42 43 wrapProgram "$out/bin/losslesscut" \ 43 44 --add-flags "--disable-seccomp-filter-sandbox" 44 45 '';
+2
pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
··· 12 12 , targetPkgs ? pkgs: [] 13 13 , multiPkgs ? pkgs: [] 14 14 , multiArch ? false # Whether to include 32bit packages 15 + , nativeBuildInputs ? [] 15 16 , extraBuildCommands ? "" 16 17 , extraBuildCommandsMulti ? "" 17 18 , extraOutputsToInstall ? [] ··· 257 258 ''; 258 259 259 260 in runCommandLocal "${name}-fhs" { 261 + inherit nativeBuildInputs; 260 262 passthru = { 261 263 inherit args baseTargetPaths targetPaths baseMultiPaths ldconfig isMultiBuild; 262 264 };
+2 -1
pkgs/build-support/build-fhsenv-bubblewrap/default.nix
··· 10 10 }: 11 11 12 12 { runScript ? "bash" 13 + , nativeBuildInputs ? [] 13 14 , extraInstallCommands ? "" 14 15 , meta ? {} 15 16 , passthru ? {} ··· 270 271 271 272 bin = writeShellScript "${name}-bwrap" (bwrapCmd { initArgs = ''"$@"''; }); 272 273 in runCommandLocal name (nameAttrs // { 273 - inherit meta; 274 + inherit nativeBuildInputs meta; 274 275 275 276 passthru = passthru // { 276 277 env = runCommandLocal "${name}-shell-env" {
+2 -2
pkgs/build-support/build-fhsenv-chroot/default.nix
··· 2 2 3 3 let buildFHSEnv = callPackage ./env.nix { }; in 4 4 5 - args@{ name, version ? null, runScript ? "bash", extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: 5 + args@{ name, version ? null, runScript ? "bash", nativeBuildInputs ? [], extraInstallCommands ? "", meta ? {}, passthru ? {}, ... }: 6 6 7 7 let 8 8 env = buildFHSEnv (removeAttrs args [ "version" "runScript" "extraInstallCommands" "meta" "passthru" ]); ··· 28 28 nameAndVersion = name + versionStr; 29 29 30 30 in runCommandLocal nameAndVersion { 31 - inherit meta; 31 + inherit nativeBuildInputs meta; 32 32 33 33 passthru = passthru // { 34 34 env = runCommandLocal "${name}-shell-env" {
+2
pkgs/build-support/build-fhsenv-chroot/env.nix
··· 4 4 , profile ? "" 5 5 , targetPkgs ? pkgs: [] 6 6 , multiPkgs ? pkgs: [] 7 + , nativeBuildInputs ? [] 7 8 , extraBuildCommands ? "" 8 9 , extraBuildCommandsMulti ? "" 9 10 , extraOutputsToInstall ? [] ··· 245 246 246 247 in stdenv.mkDerivation { 247 248 name = "${name}-fhs"; 249 + inherit nativeBuildInputs; 248 250 buildCommand = '' 249 251 mkdir -p $out 250 252 cd $out
+2 -1
pkgs/by-name/an/anytype/package.nix
··· 12 12 in appimageTools.wrapType2 { 13 13 inherit pname version src; 14 14 15 + nativeBuildInputs = [ makeWrapper ]; 16 + 15 17 extraPkgs = pkgs: [ pkgs.libsecret ]; 16 18 17 19 extraInstallCommands = '' 18 - source "${makeWrapper}/nix-support/setup-hook" 19 20 wrapProgram $out/bin/${pname} \ 20 21 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ 21 22 --add-flags ${lib.escapeShellArg commandLineArgs}
+2 -1
pkgs/by-name/ba/bazecor/package.nix
··· 31 31 # taken from 32 32 # https://github.com/Dygmalab/Bazecor/blob/v1.4.4/src/main/utils/udev.ts#L6 33 33 34 + nativeBuildInputs = [ makeWrapper ]; 35 + 34 36 extraPkgs = pkgs: [ pkgs.glib ]; 35 37 36 38 # Also expose the udev rules here, so it can be used as: ··· 38 40 # to allow non-root modifications to the keyboards. 39 41 40 42 extraInstallCommands = '' 41 - source "${makeWrapper}/nix-support/setup-hook" 42 43 wrapProgram $out/bin/bazecor \ 43 44 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" 44 45
+2 -1
pkgs/by-name/be/beekeeper-studio/package.nix
··· 29 29 appimageTools.wrapType2 { 30 30 inherit pname version src; 31 31 32 + nativeBuildInputs = [ makeWrapper ]; 33 + 32 34 extraInstallCommands = '' 33 - source "${makeWrapper}/nix-support/setup-hook" 34 35 wrapProgram $out/bin/${pname} \ 35 36 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" 36 37 install -Dm444 ${appimageContents}/${pname}.desktop -t $out/share/applications/
+2 -1
pkgs/by-name/ca/caido/package.nix
··· 33 33 src = desktop; 34 34 inherit pname version; 35 35 36 + nativeBuildInputs = [ makeWrapper ]; 37 + 36 38 extraPkgs = pkgs: [ pkgs.libthai ]; 37 39 38 40 extraInstallCommands = '' 39 41 install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications 40 42 install -m 444 -D ${appimageContents}/caido.png \ 41 43 $out/share/icons/hicolor/512x512/apps/caido.png 42 - source "${makeWrapper}/nix-support/setup-hook" 43 44 wrapProgram $out/bin/caido \ 44 45 --set WEBKIT_DISABLE_COMPOSITING_MODE 1 45 46 '';
+2 -1
pkgs/by-name/lu/lunar-client/package.nix
··· 13 13 hash = "sha512-hzW7khHfWEYPtzMmedy/dXqKh7LPniqI7/0F1FtBtrlDnEIEQUq/7VUcygsVTBI6kuj8vTG5+PYcLez+cYAjqg=="; 14 14 }; 15 15 16 + nativeBuildInputs = [ makeWrapper ]; 17 + 16 18 extraInstallCommands = 17 19 let contents = appimageTools.extract { inherit pname version src; }; 18 20 in '' 19 - source "${makeWrapper}/nix-support/setup-hook" 20 21 wrapProgram $out/bin/lunarclient \ 21 22 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" 22 23 install -Dm444 ${contents}/lunarclient.desktop -t $out/share/applications/
+2 -1
pkgs/by-name/mu/muffon/package.nix
··· 17 17 appimageTools.wrapType2 { 18 18 inherit pname src version; 19 19 20 + nativeBuildInputs = [ makeWrapper ]; 21 + 20 22 extraInstallCommands = '' 21 - source "${makeWrapper}/nix-support/setup-hook" 22 23 wrapProgram $out/bin/muffon \ 23 24 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" 24 25 install -m 444 -D ${appimageContents}/muffon.desktop -t $out/share/applications
+2 -1
pkgs/development/tools/altair-graphql-client/default.nix
··· 14 14 appimageTools.wrapType2 { 15 15 inherit src pname version; 16 16 17 + nativeBuildInputs = [ makeWrapper ]; 18 + 17 19 extraInstallCommands = '' 18 - source "${makeWrapper}/nix-support/setup-hook" 19 20 wrapProgram $out/bin/${pname} \ 20 21 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" 21 22
+2 -1
pkgs/tools/misc/wootility/default.nix
··· 16 16 appimageTools.wrapType2 { 17 17 inherit pname version src; 18 18 19 + nativeBuildInputs = [ makeWrapper ]; 20 + 19 21 extraInstallCommands = 20 22 let contents = appimageTools.extract { inherit pname version src; }; 21 23 in '' 22 - source "${makeWrapper}/nix-support/setup-hook" 23 24 wrapProgram $out/bin/wootility \ 24 25 --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" 25 26