cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

buildFHSUserEnv: use bubblewrap by default

Browse source
This commit is contained in:
Atemu 2023-04-11 12:43:22 +02:00
parent 85b081528b
commit 1baab4e14a
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkgs/top-level/all-packages.nix
View file

@ -194,9 +194,7 @@ with pkgs;
appflowy = callPackage ../applications/office/appflowy { }; appflowy = callPackage ../applications/office/appflowy { };
appimageTools = callPackage ../build-support/appimage { appimageTools = callPackage ../build-support/appimage { };
buildFHSUserEnv = buildFHSUserEnvBubblewrap;
};
appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { }; appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { };
@ -373,8 +371,7 @@ with pkgs;
buildEnv = callPackage ../build-support/buildenv { }; # not actually a package buildEnv = callPackage ../build-support/buildenv { }; # not actually a package
# TODO: eventually migrate everything to buildFHSUserEnvBubblewrap buildFHSUserEnv = buildFHSUserEnvBubblewrap;
buildFHSUserEnv = buildFHSUserEnvChroot;
buildFHSUserEnvChroot = callPackage ../build-support/build-fhs-userenv { }; buildFHSUserEnvChroot = callPackage ../build-support/build-fhs-userenv { };
buildFHSUserEnvBubblewrap = callPackage ../build-support/build-fhs-userenv-bubblewrap { }; buildFHSUserEnvBubblewrap = callPackage ../build-support/build-fhs-userenv-bubblewrap { };
@ -12336,9 +12333,7 @@ with pkgs;
openjdk = openjdk.override { enableJavaFX = true; }; openjdk = openjdk.override { enableJavaFX = true; };
}; };
sparrow = callPackage ../applications/blockchains/sparrow/fhsenv.nix { sparrow = callPackage ../applications/blockchains/sparrow/fhsenv.nix { };
buildFHSUserEnv = buildFHSUserEnvBubblewrap;
};
sparsehash = callPackage ../development/libraries/sparsehash { }; sparsehash = callPackage ../development/libraries/sparsehash { };
@ -28814,9 +28809,7 @@ with pkgs;
ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; ams-lv2 = callPackage ../applications/audio/ams-lv2 { };
androidStudioPackages = recurseIntoAttrs androidStudioPackages = recurseIntoAttrs
(callPackage ../applications/editors/android-studio { (callPackage ../applications/editors/android-studio { });
buildFHSUserEnv = buildFHSUserEnvBubblewrap;
});
android-studio = androidStudioPackages.stable; android-studio = androidStudioPackages.stable;
animbar = callPackage ../applications/graphics/animbar { }; animbar = callPackage ../applications/graphics/animbar { };
@ -31783,9 +31776,7 @@ with pkgs;
luppp = callPackage ../applications/audio/luppp { }; luppp = callPackage ../applications/audio/luppp { };
lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { }; lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { };
lutris = callPackage ../applications/misc/lutris/fhsenv.nix { lutris = callPackage ../applications/misc/lutris/fhsenv.nix { };
buildFHSUserEnv = buildFHSUserEnvBubblewrap;
};
lutris-free = lutris.override { lutris-free = lutris.override {
steamSupport = false; steamSupport = false;
}; };
@ -35548,9 +35539,7 @@ with pkgs;
heroic-unwrapped = callPackage ../games/heroic { }; heroic-unwrapped = callPackage ../games/heroic { };
heroic = callPackage ../games/heroic/fhsenv.nix { heroic = callPackage ../games/heroic/fhsenv.nix { };
buildFHSUserEnv = buildFHSUserEnvBubblewrap;
};
julius = callPackage ../games/julius { }; julius = callPackage ../games/julius { };
@ -35654,7 +35643,7 @@ with pkgs;
anki = callPackage ../games/anki { anki = callPackage ../games/anki {
inherit (darwin.apple_sdk.frameworks) CoreAudio; inherit (darwin.apple_sdk.frameworks) CoreAudio;
}; };
anki-bin = callPackage ../games/anki/bin.nix { buildFHSUserEnv = buildFHSUserEnvBubblewrap; }; anki-bin = callPackage ../games/anki/bin.nix { };
armagetronad = callPackage ../games/armagetronad { }; armagetronad = callPackage ../games/armagetronad { };
@ -36487,9 +36476,7 @@ with pkgs;
stockfish = callPackage ../games/stockfish { }; stockfish = callPackage ../games/stockfish { };
steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { });
buildFHSUserEnv = buildFHSUserEnvBubblewrap;
});
steam = steamPackages.steam-fhsenv; steam = steamPackages.steam-fhsenv;
steam-small = steamPackages.steam-fhsenv-small; steam-small = steamPackages.steam-fhsenv-small;