diff options
| author | Atemu <atemu.main@gmail.com> | 2023-04-16 13:03:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-16 13:03:36 +0200 |
| commit | 445ef285482ece1e88a43168d79def461b2eb83e (patch) | |
| tree | 860a4c4433e58ff212615933c9b3fc5d6904b2dc /pkgs/applications/science | |
| parent | 327a9c55a3294d58a28ddc6ca7eac5cd10b55aec (diff) | |
| parent | d978b588655200a5510642760e9dfbbd83242119 (diff) | |
Merge pull request #225748 from Atemu/buildFHSEnvBubblewrap-by-default
buildFHSEnv: use bubblewrap by default
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/electronics/bitscope/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/foldingathome/client.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 1cd23d0f414d7..6a024748daf28 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -1,5 +1,5 @@ { atk -, buildFHSUserEnv +, buildFHSEnv , cairo , dpkg , gdk-pixbuf @@ -56,7 +56,7 @@ let ${(wrapBinary libs) attrs.toolName} ''; }); -in buildFHSUserEnv { +in buildFHSEnv { name = "${attrs.toolName}-${attrs.version}"; runScript = "${pkg.outPath}/bin/${attrs.toolName}"; } // { inherit (pkg) meta name; } diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix index 47a86fa2aeaf1..c927df9a54916 100644 --- a/pkgs/applications/science/misc/foldingathome/client.nix +++ b/pkgs/applications/science/misc/foldingathome/client.nix @@ -1,6 +1,6 @@ { lib, stdenv , autoPatchelfHook -, buildFHSUserEnv +, buildFHSEnv , dpkg , fetchurl , gcc-unwrapped @@ -35,7 +35,7 @@ let installPhase = "cp -ar usr $out"; }; in -buildFHSUserEnv { +buildFHSEnv { name = fahclient.name; targetPkgs = pkgs': [ |