lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

package.nix: remove dead code

Browse source 
Change-Id: Ic0dfcfe27dbf13da4f7f74f5fab8ce6fa718d28f
This commit is contained in:
jade 2024-07-23 21:53:43 +02:00
parent 12a5838d11
commit 98e8cf9c63
1 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
package.nix
View file

@ -92,31 +92,19 @@ let
# Reimplementation of Nixpkgs' Meson cross file, with some additions to make # Reimplementation of Nixpkgs' Meson cross file, with some additions to make
# it actually work. # it actually work.
mesonCrossFile = mesonCrossFile = builtins.toFile "lix-cross-file.conf" ''
let [properties]
cpuFamily = # Meson is convinced that if !buildPlatform.canExecute hostPlatform then we cannot
platform: # build anything at all, which is not at all correct. If we can't execute the host
with platform; # platform, we'll just disable tests and doc gen.
if isAarch32 then needs_exe_wrapper = false
"arm"
else if isx86_32 then
"x86"
else
platform.uname.processor;
in
builtins.toFile "lix-cross-file.conf" ''
[properties]
# Meson is convinced that if !buildPlatform.canExecute hostPlatform then we cannot
# build anything at all, which is not at all correct. If we can't execute the host
# platform, we'll just disable tests and doc gen.
needs_exe_wrapper = false
[binaries] [binaries]
# Meson refuses to consider any CMake binary during cross compilation if it's # Meson refuses to consider any CMake binary during cross compilation if it's
# not explicitly specified here, in the cross file. # not explicitly specified here, in the cross file.
# https://github.com/mesonbuild/meson/blob/0ed78cf6fa6d87c0738f67ae43525e661b50a8a2/mesonbuild/cmake/executor.py#L72 # https://github.com/mesonbuild/meson/blob/0ed78cf6fa6d87c0738f67ae43525e661b50a8a2/mesonbuild/cmake/executor.py#L72
cmake = 'cmake' cmake = 'cmake'
''; '';
# The internal API docs need these for the build, but if we're not building # The internal API docs need these for the build, but if we're not building
# Nix itself, then these don't need to be propagated. # Nix itself, then these don't need to be propagated.