cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #200711 from Artturin/xorgfixfailures

Browse source 
xorg.imake,xorg.xdm: fix cross
This commit is contained in:
Artturi 2022-11-12 21:32:17 +02:00 committed by GitHub
commit 6d7adea228
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/servers/x11/xorg/overrides.nix
View file

@ -68,6 +68,8 @@ self: super:
then "${tradcpp}/bin/cpp"
else "gcc"}\"'";
configureFlags = attrs.configureFlags or [] ++ [ "ac_cv_path_RAWCPP=${stdenv.cc.targetPrefix}cpp" ];
inherit tradcpp;
});
@ -151,6 +153,11 @@ self: super:
xdm = super.xdm.overrideAttrs (attrs: {
buildInputs = attrs.buildInputs ++ [ libxcrypt ];
configureFlags = attrs.configureFlags or [] ++ [
"ac_cv_path_RAWCPP=${stdenv.cc.targetPrefix}cpp"
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)
# checking for /dev/urandom... configure: error: cannot check for file existence when cross compiling
[ "ac_cv_file__dev_urandom=true" "ac_cv_file__dev_random=true" ];
});
# Propagate some build inputs because of header file dependencies.