Commit 24a513a8 authored by Atemu's avatar Atemu
Browse files

tree-wide: do not depend on buildFHSEnvBubblewrap 

It's the default now.
parent 2a641efe

pkgs/applications/editors/vscode/generic.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, lib, makeDesktopItem

, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages

, atomEnv, at-spi2-atk, autoPatchelfHook

, systemd, fontconfig, libdbusmenu, glib, buildFHSEnvBubblewrap, wayland

, systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland



# Populate passthru.tests

, tests
@@ -152,7 +152,7 @@ let 
  #

  # buildFHSEnv allows for users to use the existing vscode

  # extension tooling without significant pain.

  fhs = { additionalPkgs ? pkgs: [] }: buildFHSEnvBubblewrap {

  fhs = { additionalPkgs ? pkgs: [] }: buildFHSEnv {

    # also determines the name of the wrapped command

    name = executableName;

pkgs/applications/misc/bottles/fhsenv.nix

+3 −3
Original line number Diff line number Diff line 
{ lib

, buildFHSEnvBubblewrap

, buildFHSEnv

, symlinkJoin

, bottles-unwrapped

, gst_all_1
@@ -99,8 +99,8 @@ in 
symlinkJoin {

  name = "bottles";

  paths = [

    (buildFHSEnvBubblewrap (fhsEnv // { name = "bottles"; runScript = "bottles"; }))

    (buildFHSEnvBubblewrap (fhsEnv // { name = "bottles-cli"; runScript = "bottles-cli"; }))

    (buildFHSEnv (fhsEnv // { name = "bottles"; runScript = "bottles"; }))

    (buildFHSEnv (fhsEnv // { name = "bottles-cli"; runScript = "bottles-cli"; }))

  ];

  postBuild = ''

    mkdir -p $out/share

pkgs/applications/networking/cisco-packet-tracer/7.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv

, lib

, buildFHSEnvBubblewrap

, buildFHSEnv

, copyDesktopItems

, dpkg

, lndir
@@ -40,7 +40,7 @@ let 
    mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ];

  };



  fhs = buildFHSEnvBubblewrap {

  fhs = buildFHSEnv {

    name = "packettracer7";

    runScript = "${ptFiles}/bin/packettracer7";

pkgs/applications/networking/cisco-packet-tracer/8.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
, lib

, alsa-lib

, autoPatchelfHook

, buildFHSEnvBubblewrap

, buildFHSEnv

, copyDesktopItems

, dbus

, dpkg
@@ -97,7 +97,7 @@ let 
    mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ];

  };



  fhs = buildFHSEnvBubblewrap {

  fhs = buildFHSEnv {

    name = "packettracer8";

    runScript = "${ptFiles}/bin/packettracer";

    targetPkgs = pkgs: [ libudev0-shim ];

pkgs/applications/video/webtorrent_desktop/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
##  - export ELECTRON_SKIP_BINARY_DOWNLOAD=1

##  - jq "del(.scripts.preinstall)" node_modules/shellcheck/package.json | sponge node_modules/shellcheck/package.json

{

  lib, stdenv, buildFHSEnvBubblewrap, runCommand, writeScript, fetchurl, fetchzip

  lib, stdenv, buildFHSEnv, runCommand, writeScript, fetchurl, fetchzip

}:

let

  pname = "webtorrent-desktop";
@@ -20,7 +20,7 @@ runCommand "${pname}-${version}" rec { 
    else

      throw "Webtorrent is not currently supported on ${stdenv.hostPlatform.system}";



  fhs = buildFHSEnvBubblewrap rec {

  fhs = buildFHSEnv rec {

    name = "fhsEnterWebTorrent";

    runScript = "${src}/WebTorrent";

    ## use the trampoline, if you need to shell into the fhsenv