diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-10-13 09:47:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 09:47:49 +0200 |
| commit | 35ce480d69778867c1de820188879bbad6bc2f75 (patch) | |
| tree | 46e7ec52b6ade87bb750b134aa9cd807efa34b13 /pkgs/os-specific/linux | |
| parent | 20c4986c4dd9b014991c619498ae6ef09aa5d0aa (diff) | |
| parent | eeaf3a131fbe8611d59592ae2e215131b23c70e5 (diff) | |
| download | nixlib-35ce480d69778867c1de820188879bbad6bc2f75.tar nixlib-35ce480d69778867c1de820188879bbad6bc2f75.tar.gz nixlib-35ce480d69778867c1de820188879bbad6bc2f75.tar.bz2 nixlib-35ce480d69778867c1de820188879bbad6bc2f75.tar.lz nixlib-35ce480d69778867c1de820188879bbad6bc2f75.tar.xz nixlib-35ce480d69778867c1de820188879bbad6bc2f75.tar.zst nixlib-35ce480d69778867c1de820188879bbad6bc2f75.zip | |
Merge pull request #47964 from NixOS/staging-next
Merge staging-next into master
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/paxctl/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/paxctl/default.nix b/pkgs/os-specific/linux/paxctl/default.nix index 52e4c512f9a2..8fdd2356c30d 100644 --- a/pkgs/os-specific/linux/paxctl/default.nix +++ b/pkgs/os-specific/linux/paxctl/default.nix @@ -9,18 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0biw882fp1lmgs6kpxznp1v6758r7dg9x8iv5a06k0b82bcdsc53"; }; - # TODO Always do first way next mass rebuild. - buildInputs = stdenv.lib.optional - (!stdenv.hostPlatform.isLinux || !stdenv.buildPlatform.isLinux) - elf-header; + buildInputs = [ elf-header ]; - # TODO Always do first way next mass rebuild. - preBuild = if !stdenv.hostPlatform.isLinux || !stdenv.buildPlatform.isLinux then '' + preBuild = '' sed -i Makefile \ -e 's|--owner 0 --group 0||g' \ -e '/CC:=gcc/d' - '' else '' - sed "s|--owner 0 --group 0||g" -i Makefile ''; makeFlags = [ |