Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7a8f0b3b8023
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f952058df732
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 15, 2018

  1. pam: Remove crossAttrs 

    It turns out none of this stuff is needed. The docs aren't evenly built
properly anyways so the build trivially succeeds either way, due to what
looks like upstream misunderstanding automake. If I try to build the
docs manually in a cross shell (before and after this change), there's a
make rule error such that some HTML files aren't even attempted to be
built and then a copy fails.

Even if this was all fixed, these been a good number of cross fixes
upstream getting them to use CC_FOR_BUILD and other good stuff, so I
doubt such hacks would be needed.

Progress towards #40531 and #33302.
    @Ericson2314
    Ericson2314 committed May 15, 2018
    Copy the full SHA
    29b62e0 View commit details

  2. Merge pull request #40538 from obsidiansystems/linux-pam-cross 

    pam: Remove crossAttrs
    @Ericson2314
    Ericson2314 authored May 15, 2018
    Copy the full SHA
    f952058 View commit details
Showing with 0 additions and 15 deletions.
  1. +0 −15 pkgs/os-specific/linux/pam/default.nix
15 changes: 0 additions & 15 deletions pkgs/os-specific/linux/pam/default.nix
View file
Original file line number Diff line number Diff line change
@@ -33,21 +33,6 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

crossAttrs = {
propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ];
preConfigure = preConfigure + ''
$crossConfig-ar x ${flex.crossDrv}/lib/libfl.a
mv libyywrap.o libyywrap-target.o
ar x ${flex}/lib/libfl.a
mv libyywrap.o libyywrap-host.o
export LDFLAGS="$LDFLAGS $PWD/libyywrap-target.o"
sed -e 's/@CC@/gcc/' -i doc/specs/Makefile.in
'';
postConfigure = ''
sed -e "s@ $PWD/libyywrap-target.o@ $PWD/libyywrap-host.o@" -i doc/specs/Makefile
'';
};

postInstall = ''
mv -v $out/sbin/unix_chkpwd{,.orig}
ln -sv /run/wrappers/bin/unix_chkpwd $out/sbin/unix_chkpwd