Skip to content

musl-fts: setup-hook to add -lfts, use in xar and libselinux #37885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dtzWill merged 2 commits into from
Mar 26, 2018
Merged

musl-fts: setup-hook to add -lfts, use in xar and libselinux #37885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebf04d8
musl-fts: add setup-hook to add -lfts
dtzWill Mar 26, 2018
69ca330
xar, libselinux: use musl-fts on musl, fix
dtzWill Mar 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkgs/os-specific/linux/libselinux/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, libsepol, pcre
, enablePython ? true, swig ? null, python ? null
, musl-fts
}:

assert enablePython -> swig != null && python != null;
Expand All @@ -18,7 +19,8 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libsepol pcre ]
++ optionals enablePython [ swig python ];
++ optionals enablePython [ swig python ]
++ optional stdenv.hostPlatform.isMusl musl-fts;

# Avoid this false warning:
# avc_internal.c: In function 'avc_netlink_receive':
Expand Down
17 changes: 17 additions & 0 deletions pkgs/os-specific/linux/musl/fts-setup-hook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ftsLdflags() {
# The `depHostOffset` describes how the host platform of the dependencies
# are slid relative to the depending package. It is brought into scope of
# the environment hook defined as the role of the dependency being applied.
case $depHostOffset in
-1) local role='BUILD_' ;;
0) local role='' ;;
1) local role='TARGET_' ;;
*) echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;
return 1 ;;
esac

export NIX_${role}LDFLAGS+=" -lfts"
}

addEnvHooks "$hostOffset" ftsLdflags

2 changes: 2 additions & 0 deletions pkgs/os-specific/linux/musl/fts.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];

setupHook = ./fts-setup-hook.sh;
}
5 changes: 3 additions & 2 deletions pkgs/tools/compression/xar/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2 }:
{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, musl-fts }:

stdenv.mkDerivation rec {
version = "1.6.1";
Expand All @@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf";
};

buildInputs = [ libxml2 openssl zlib bzip2 ];
buildInputs = [ libxml2 openssl zlib bzip2 ]
++ stdenv.lib.optional stdenv.hostPlatform.isMusl musl-fts;

meta = {
homepage = https://mackyle.github.io/xar/;
Expand Down