build: fix deprecated uses of configure_file

Using `configure_file` to copy files has been deprecated since Meson 0.64.0.
The intended replacement is the `fs.copyfile` method.

This removes the following deprecation warning that arises when a minimum
Meson version is specified:

``
Project [...] uses feature deprecated since '0.64.0': copy arg in configure_file. Use fs.copyfile instead
``

Change-Id: I09ffc92e96311ef9ed594343a0a16d51e74b114a
This commit is contained in:
Olivia Crain 2024-09-26 14:28:25 -05:00
parent 0e6b3435a1
commit 624f44bf25
Signed by: oliviacrain
SSH key fingerprint: SHA256:806T83jIOORGsRiDFdUJOHAQg3lI/gIYfrFScH2snPY
7 changed files with 16 additions and 32 deletions

View file

@ -593,10 +593,10 @@ run_command(
) )
if is_darwin if is_darwin
configure_file( fs.copyfile(
input : 'misc/launchd/org.nixos.nix-daemon.plist.in', 'misc/launchd/org.nixos.nix-daemon.plist.in',
output : 'org.nixos.nix-daemon.plist', 'org.nixos.nix-daemon.plist',
copy : true, install : true,
install_dir : prefix / 'Library/LaunchDaemons', install_dir : prefix / 'Library/LaunchDaemons',
) )
endif endif

View file

@ -1,8 +1,7 @@
configure_file( fs.copyfile(
input : 'completion.sh', 'completion.sh',
output : 'nix', 'nix',
install : true, install : true,
install_dir : datadir / 'bash-completion/completions', install_dir : datadir / 'bash-completion/completions',
install_mode : 'rw-r--r--', install_mode : 'rw-r--r--',
copy : true,
) )

View file

@ -1,8 +1,7 @@
configure_file( fs.copyfile(
input : 'completion.fish', 'completion.fish',
output : 'nix.fish', 'nix.fish',
install : true, install : true,
install_dir : datadir / 'fish/vendor_completions.d', install_dir : datadir / 'fish/vendor_completions.d',
install_mode : 'rw-r--r--', install_mode : 'rw-r--r--',
copy : true,
) )

View file

@ -5,8 +5,4 @@ subdir('zsh')
subdir('systemd') subdir('systemd')
subdir('flake-registry') subdir('flake-registry')
runinpty = configure_file( runinpty = fs.copyfile('runinpty.py')
copy : true,
input : meson.current_source_dir() / 'runinpty.py',
output : 'runinpty.py',
)

View file

@ -1,10 +1,9 @@
foreach script : [ [ 'completion.zsh', '_nix' ], [ 'run-help-nix' ] ] foreach script : [ [ 'completion.zsh', '_nix' ], [ 'run-help-nix' ] ]
configure_file( fs.copyfile(
input : script[0], script[0],
output : script.get(1, script[0]), script.get(1, script[0]),
install : true, install : true,
install_dir : datadir / 'zsh/site-functions', install_dir : datadir / 'zsh/site-functions',
install_mode : 'rw-r--r--', install_mode : 'rw-r--r--',
copy : true,
) )
endforeach endforeach

View file

@ -8,12 +8,7 @@ configure_file(
} }
) )
# https://github.com/mesonbuild/meson/issues/860 fs.copyfile('nix-profile.sh.in')
configure_file(
input : 'nix-profile.sh.in',
output : 'nix-profile.sh.in',
copy : true,
)
foreach rc : [ '.sh', '.fish', '-daemon.sh', '-daemon.fish' ] foreach rc : [ '.sh', '.fish', '-daemon.sh', '-daemon.fish' ]
configure_file( configure_file(

View file

@ -1,5 +1 @@
configure_file( fs.copyfile('unpack-channel.nix')
input : 'unpack-channel.nix',
output : 'unpack-channel.nix',
copy : true,
)