public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix eval

Browse Source
This commit is contained in:
Matthew Bauer 2018-05-31 12:44:17 -04:00
parent e99322507e
commit ae6a4a913c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/libselinux/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pcre, pkgconfig, libsepol { stdenv, fetchurl, pcre, pkgconfig, libsepol
, enablePython ? true, swig ? null, python ? null , enablePython ? true, swig ? null, python ? null
, musl-fts , fts
}: }:
assert enablePython -> swig != null && python != null; assert enablePython -> swig != null && python != null;
@ -18,9 +18,8 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libsepol pcre ] buildInputs = [ libsepol pcre fts ]
++ optionals enablePython [ swig python ] ++ optionals enablePython [ swig python ];
++ optional stdenv.hostPlatform.isMusl musl-fts;
# drop fortify here since package uses it by default, leading to compile error: # drop fortify here since package uses it by default, leading to compile error:
# command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]

4
pkgs/top-level/unix-tools.nix
View File

@ -50,12 +50,12 @@ let
linux = pkgs.utillinux; linux = pkgs.utillinux;
}; };
getconf = { getconf = {
linux = if hostPlatform.isGNU then lib.getBin pkgs.glibc linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc
else pkgs.netbsd.getconf; else pkgs.netbsd.getconf;
darwin = pkgs.darwin.system_cmds; darwin = pkgs.darwin.system_cmds;
}; };
getent = { getent = {
linux = if hostPlatform.isGNU then lib.getBin pkgs.glibc linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc
else pkgs.netbsd.getent; else pkgs.netbsd.getent;
darwin = pkgs.netbsd.getent; darwin = pkgs.netbsd.getent;
}; };