nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-27 06:25:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #187161 from K900/fix-eval

Browse Source 
build-fhs-userenv-bubblewrap: fix eval
This commit is contained in:
K900 2022-08-17 22:39:57 +03:00 committed by GitHub
commit 3643cde373
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix
View File

@ -22,7 +22,7 @@
# /lib will link to /lib32 # /lib will link to /lib32
let let
inherit (stdenv) is64Bit; inherit (stdenv) is64bit;
# use of glibc_multi is only supported on x86_64-linux # use of glibc_multi is only supported on x86_64-linux
isMultiBuild = multiPkgs != null && stdenv.isx86_64 && stdenv.isLinux; isMultiBuild = multiPkgs != null && stdenv.isx86_64 && stdenv.isLinux;
@ -141,7 +141,7 @@ let
setupLibDirsTarget = '' setupLibDirsTarget = ''
# link content of targetPaths # link content of targetPaths
cp -rsHf ${staticUsrProfileTarget}/lib lib cp -rsHf ${staticUsrProfileTarget}/lib lib
ln -s lib lib${if is64Bit then "64" else "32"} ln -s lib lib${if is64bit then "64" else "32"}
''; '';
# setup /lib, /lib32 and /lib64 # setup /lib, /lib32 and /lib64