b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

tree-wide: do not depend on buildFHSEnvBubblewrap

Browse source 
It's the default now.
This commit is contained in:
Atemu 2023-04-11 15:59:32 +02:00
parent 2a641efe76
commit 24a513a87c
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/vscode/generic.nix
View file

@ -1,7 +1,7 @@
{ stdenv, lib, makeDesktopItem { stdenv, lib, makeDesktopItem
, unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages , unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages
, atomEnv, at-spi2-atk, autoPatchelfHook , atomEnv, at-spi2-atk, autoPatchelfHook
, systemd, fontconfig, libdbusmenu, glib, buildFHSEnvBubblewrap, wayland , systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland
# Populate passthru.tests # Populate passthru.tests
, tests , tests
@ -152,7 +152,7 @@ let
# #
# buildFHSEnv allows for users to use the existing vscode # buildFHSEnv allows for users to use the existing vscode
# extension tooling without significant pain. # extension tooling without significant pain.
fhs = { additionalPkgs ? pkgs: [] }: buildFHSEnvBubblewrap { fhs = { additionalPkgs ? pkgs: [] }: buildFHSEnv {
# also determines the name of the wrapped command # also determines the name of the wrapped command
name = executableName; name = executableName;

6
pkgs/applications/misc/bottles/fhsenv.nix
View file

@ -1,5 +1,5 @@
{ lib { lib
, buildFHSEnvBubblewrap , buildFHSEnv
, symlinkJoin , symlinkJoin
, bottles-unwrapped , bottles-unwrapped
, gst_all_1 , gst_all_1
@ -99,8 +99,8 @@ in
symlinkJoin { symlinkJoin {
name = "bottles"; name = "bottles";
paths = [ paths = [
(buildFHSEnvBubblewrap (fhsEnv // { name = "bottles"; runScript = "bottles"; })) (buildFHSEnv (fhsEnv // { name = "bottles"; runScript = "bottles"; }))
(buildFHSEnvBubblewrap (fhsEnv // { name = "bottles-cli"; runScript = "bottles-cli"; })) (buildFHSEnv (fhsEnv // { name = "bottles-cli"; runScript = "bottles-cli"; }))
]; ];
postBuild = '' postBuild = ''
mkdir -p $out/share mkdir -p $out/share

4
pkgs/applications/networking/cisco-packet-tracer/7.nix
View file

@ -1,6 +1,6 @@
{ stdenv { stdenv
, lib , lib
, buildFHSEnvBubblewrap , buildFHSEnv
, copyDesktopItems , copyDesktopItems
, dpkg , dpkg
, lndir , lndir
@ -40,7 +40,7 @@ let
mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ]; mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ];
}; };
fhs = buildFHSEnvBubblewrap { fhs = buildFHSEnv {
name = "packettracer7"; name = "packettracer7";
runScript = "${ptFiles}/bin/packettracer7"; runScript = "${ptFiles}/bin/packettracer7";

4
pkgs/applications/networking/cisco-packet-tracer/8.nix
View file

@ -2,7 +2,7 @@
, lib , lib
, alsa-lib , alsa-lib
, autoPatchelfHook , autoPatchelfHook
, buildFHSEnvBubblewrap , buildFHSEnv
, copyDesktopItems , copyDesktopItems
, dbus , dbus
, dpkg , dpkg
@ -97,7 +97,7 @@ let
mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ]; mimeTypes = [ "application/x-pkt" "application/x-pka" "application/x-pkz" ];
}; };
fhs = buildFHSEnvBubblewrap { fhs = buildFHSEnv {
name = "packettracer8"; name = "packettracer8";
runScript = "${ptFiles}/bin/packettracer"; runScript = "${ptFiles}/bin/packettracer";
targetPkgs = pkgs: [ libudev0-shim ]; targetPkgs = pkgs: [ libudev0-shim ];

4
pkgs/applications/video/webtorrent_desktop/default.nix
View file

@ -2,7 +2,7 @@
## - export ELECTRON_SKIP_BINARY_DOWNLOAD=1 ## - export ELECTRON_SKIP_BINARY_DOWNLOAD=1
## - jq "del(.scripts.preinstall)" node_modules/shellcheck/package.json | sponge node_modules/shellcheck/package.json ## - 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 let
pname = "webtorrent-desktop"; pname = "webtorrent-desktop";
@ -20,7 +20,7 @@ runCommand "${pname}-${version}" rec {
else else
throw "Webtorrent is not currently supported on ${stdenv.hostPlatform.system}"; throw "Webtorrent is not currently supported on ${stdenv.hostPlatform.system}";
fhs = buildFHSEnvBubblewrap rec { fhs = buildFHSEnv rec {
name = "fhsEnterWebTorrent"; name = "fhsEnterWebTorrent";
runScript = "${src}/WebTorrent"; runScript = "${src}/WebTorrent";
## use the trampoline, if you need to shell into the fhsenv ## use the trampoline, if you need to shell into the fhsenv

4
pkgs/servers/onlyoffice-documentserver/default.nix
View file

@ -1,6 +1,6 @@
{ lib { lib
, stdenv , stdenv
, buildFHSEnvBubblewrap , buildFHSEnv
, corefonts , corefonts
, dejavu_fonts , dejavu_fonts
, dpkg , dpkg
@ -57,7 +57,7 @@ let
dontStrip = true; dontStrip = true;
passthru = { passthru = {
fhs = buildFHSEnvBubblewrap { fhs = buildFHSEnv {
name = "onlyoffice-wrapper"; name = "onlyoffice-wrapper";
targetPkgs = pkgs: [ targetPkgs = pkgs: [

4
pkgs/servers/plex/default.nix
View file

@ -1,6 +1,6 @@
# The actual Plex package that we run is a FHS userenv of the "raw" package. # The actual Plex package that we run is a FHS userenv of the "raw" package.
{ stdenv { stdenv
, buildFHSEnvBubblewrap , buildFHSEnv
, writeScript , writeScript
, plexRaw , plexRaw
@ -9,7 +9,7 @@
, dataDir ? "/var/lib/plex" , dataDir ? "/var/lib/plex"
}: }:
buildFHSEnvBubblewrap { buildFHSEnv {
name = "plexmediaserver"; name = "plexmediaserver";
inherit (plexRaw) meta; inherit (plexRaw) meta;