diff options
| author | Luigi Sartor Piucco <luigipiucco@gmail.com> | 2021-02-03 21:25:55 -0300 |
|---|---|---|
| committer | Luigi Sartor Piucco <luigipiucco@gmail.com> | 2021-02-22 14:35:45 -0300 |
| commit | bdd902776093bca7e004c5eade5a19557bbd4bdd (patch) | |
| tree | 258076b63fe7bd264287921a382da1c5da319eaa /pkgs/build-support/build-fhs-userenv-bubblewrap | |
| parent | 28c96887146014f2b417623552161eaa3d1db96e (diff) | |
| download | nixpkgs-bdd902776093bca7e004c5eade5a19557bbd4bdd.tar nixpkgs-bdd902776093bca7e004c5eade5a19557bbd4bdd.tar.gz nixpkgs-bdd902776093bca7e004c5eade5a19557bbd4bdd.tar.bz2 nixpkgs-bdd902776093bca7e004c5eade5a19557bbd4bdd.tar.lz nixpkgs-bdd902776093bca7e004c5eade5a19557bbd4bdd.tar.xz nixpkgs-bdd902776093bca7e004c5eade5a19557bbd4bdd.tar.zst nixpkgs-bdd902776093bca7e004c5eade5a19557bbd4bdd.zip | |
fhs-bubblewrap: merge /usr/share from both archs
Diffstat (limited to 'pkgs/build-support/build-fhs-userenv-bubblewrap')
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index bcb9a8a0767..73d705dbaa6 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, writeText, writeScriptBin, pkgs, pkgsi686Linux }: +{ stdenv, lib, buildEnv, writeText, writeScriptBin, pkgs, pkgsi686Linux }: { name, profile ? "" , targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] @@ -138,7 +138,20 @@ let mkdir -m0755 usr cd usr ${setupLibDirs} - for i in bin sbin share include; do + ${lib.optionalString isMultiBuild '' + if [ -d "${staticUsrProfileMulti}/share" ]; then + cp -rLf ${staticUsrProfileMulti}/share share + fi + ''} + if [ -d "${staticUsrProfileTarget}/share" ]; then + if [ -d share ]; then + chmod -R 755 share + cp -rLTf ${staticUsrProfileTarget}/share share + else + cp -rLf ${staticUsrProfileTarget}/share share + fi + fi + for i in bin sbin include; do if [ -d "${staticUsrProfileTarget}/$i" ]; then cp -rsHf "${staticUsrProfileTarget}/$i" "$i" fi |