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

Merge pull request #91156 from primeos/cross-compilation-fixes

Browse Source 
efibootmgr,openldap: Cross compilation fixes
This commit is contained in:
Michael Weiss 2020-06-20 13:28:00 +02:00 committed by GitHub
commit ae3d755af4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/openldap/default.nix
View File

@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
postBuild = '' postBuild = ''
make $makeFlags -C contrib/slapd-modules/passwd/sha2 make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/sha2
make $makeFlags -C contrib/slapd-modules/passwd/pbkdf2 make $makeFlags CC=$CC -C contrib/slapd-modules/passwd/pbkdf2
''; '';
doCheck = false; # needs a running LDAP server doCheck = false; # needs a running LDAP server

2
pkgs/tools/system/efibootmgr/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
# We have no LTO here since commit 22284b07. # We have no LTO here since commit 22284b07.
postPatch = if stdenv.isi686 then "sed '/^CFLAGS/s/-flto//' -i Make.defaults" else null; postPatch = if stdenv.isi686 then "sed '/^CFLAGS/s/-flto//' -i Make.defaults" else null;
makeFlags = [ "EFIDIR=nixos" ]; makeFlags = [ "EFIDIR=nixos" "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" ];
installFlags = [ "prefix=$(out)" ]; installFlags = [ "prefix=$(out)" ];