nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: autoPatchelfHook only on Linux

Browse Source
This commit is contained in:
OPNA2608
2022-03-22 18:59:05 +01:00
parent 48034046bf
commit d2f268745a
42 changed files with 106 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/mobile/androidenv/build-tools.nix
View File

@@ -2,8 +2,8 @@
deployAndroidPackage {
inherit package os;
buildInputs = [ autoPatchelfHook makeWrapper ] ++
lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ];
buildInputs = [ makeWrapper ] ++
lib.optionals (os == "linux") [ autoPatchelfHook pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ];
patchInstructions = ''
${lib.optionalString (os == "linux") ''
addAutoPatchelfSearchPath $packageBaseDir/lib

3
pkgs/development/mobile/androidenv/platform-tools.nix
View File

@@ -2,8 +2,7 @@
deployAndroidPackage {
inherit package os;
buildInputs = [ autoPatchelfHook ]
++ lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ];
buildInputs = lib.optionals (os == "linux") [ autoPatchelfHook pkgs.glibc pkgs.zlib pkgs.ncurses5 ];
patchInstructions = lib.optionalString (os == "linux") ''
addAutoPatchelfSearchPath $packageBaseDir/lib64
autoPatchelf --no-recurse $packageBaseDir/lib64