Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ perl/Makefile.config
/nix.spec
/stamp-h1
/svn-revision
/build-gcc
/libtool

/corepkgs/config.nix
Expand Down
4 changes: 4 additions & 0 deletions bootstrap-ac.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#! /bin/sh -e
rm -f aclocal.m4
mkdir -p config
exec autoreconf -vfi
8 changes: 8 additions & 0 deletions bootstrap-meson.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#! /usr/bin/env bash

rm -rf build*
meson build-gcc

cd build-gcc
ninja -j2

58 changes: 58 additions & 0 deletions corepkgs/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Nix corepkgs build file
#============================================================================




# src files
#============================================================================


corepkgs_data = files(
join_paths(meson.source_root(), 'corepkgs/buildenv.nix'),
join_paths(meson.source_root(), 'corepkgs/derivation.nix'),
join_paths(meson.source_root(), 'corepkgs/fetchurl.nix'),
join_paths(meson.source_root(), 'corepkgs/imported-drv-to-derivation.nix'),
join_paths(meson.source_root(), 'corepkgs/unpack-channel.nix'))





# targets
#============================================================================


config_nix = configuration_data()
config_nix.set('bash', bash.path())
config_nix.set('coreutils', coreutils)
config_nix.set('bzip2', bzip2.path())
config_nix.set('gzip', gzip.path())
config_nix.set('xz', xz.path())
config_nix.set('tar', tar.path())
config_nix.set('tarFlags', '')
config_nix.set('tr', tr.path())
config_nix.set('bindir', bindir)
config_nix.set('prefix', prefix)
config_nix.set('libexecdir', libexecdir)
config_nix.set('localstatedir', localstatedir)
config_nix.set('sysconfdir', sysconfdir)
config_nix.set('storedir', nixstoredir)





# build
#============================================================================


corepkgs_data += configure_file(
input : 'config.nix.in',
output : 'config.nix',
configuration : config_nix)

install_data(
corepkgs_data,
install_mode : 'rwxr-xr-x',
install_dir : join_paths(datadir, 'nix/corepkgs'))
5 changes: 5 additions & 0 deletions doc/manual/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# nix manual build file
#============================================================================


# TODO: generate the manual
13 changes: 13 additions & 0 deletions doc/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# nix doc build file
#============================================================================

doc_dirs = [
'manual'
]

if (not get_option('disable_doc_gen'))
xsltproc = find_program('xsltproc', required : true)
foreach dir : doc_dirs
subdir(dir)
endforeach
endif
Loading