zebreus/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests 1 Activity

Fix tests on systems with a non-master git defaultBranch #1

Open
zebreus wants to merge 140 commits from fix-tests-without-master into main
pull from: fix-tests-without-master
merge into: zebreus:main
Conversation 0 Commits 140 Files changed 216 +16 -32
7 changed files with 16 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 624f44bf25 - Show all commits

8
meson.build
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

7
misc/bash/meson.build
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,
) )

7
misc/fish/meson.build
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,
) )

6
misc/meson.build
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',
)

7
misc/zsh/meson.build
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

7
scripts/meson.build
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(

6
src/nix-channel/meson.build
View file

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