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

Merge pull request #101240 from gnidorah/openxray

Browse Source 
Fix builds of my packages w/glibc-2.32
This commit is contained in:
Maximilian Bosch 2020-10-27 15:10:54 +01:00 committed by GitHub
commit 3c7890d47e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/desktops/cdesktopenv/default.nix
View File

@ -74,5 +74,6 @@ EOF
license = licenses.lgpl2; license = licenses.lgpl2;
maintainers = [ maintainers.gnidorah ]; maintainers = [ maintainers.gnidorah ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
broken = true; # not compatible with glibc 2.32
}; };
} }

4
pkgs/games/openxray/default.nix
View File

@ -50,6 +50,10 @@ in stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
substituteInPlace src/xrCore/xrCore.cpp \ substituteInPlace src/xrCore/xrCore.cpp \
--replace /usr/share $out/share --replace /usr/share $out/share
# https://github.com/OpenXRay/xray-16/issues/667
echo "inline const char* xr_sys_errlist[100] = {};" >> src/Common/PlatformLinux.inl
echo "#define _sys_errlist xr_sys_errlist" >> src/Common/PlatformLinux.inl
''; '';
postInstall = '' postInstall = ''