diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-02-01T15·41+0100 |
| commit | 2f9bb5c7e744ddca3fbe5576e520a3e80c106c55 (patch) | |
| tree | 7a3d5d57a460aa87a8f8b58d46102ca339e97770 /corepkgs | |
| parent | c5ba08133370f98de722c978bda3b446721985de (diff) | |
| parent | 6dca72006aa9b1cf2f226bb5b538e744fcab976f (diff) | |
Merge branch 'make'
Diffstat (limited to 'corepkgs')
| -rw-r--r-- | corepkgs/Makefile.am | 12 | ||||
| -rw-r--r-- | corepkgs/config.nix.in | 2 | ||||
| -rw-r--r-- | corepkgs/local.mk | 5 |
3 files changed, 6 insertions, 13 deletions
diff --git a/corepkgs/Makefile.am b/corepkgs/Makefile.am deleted file mode 100644 index 111b667d0b58..000000000000 --- a/corepkgs/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -all-local: config.nix - -files = nar.nix buildenv.nix buildenv.pl unpack-channel.nix derivation.nix fetchurl.nix \ - imported-drv-to-derivation.nix - -install-exec-local: - $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs - $(INSTALL_DATA) config.nix $(files) $(DESTDIR)$(datadir)/nix/corepkgs - -include ../substitute.mk - -EXTRA_DIST = config.nix.in $(files) diff --git a/corepkgs/config.nix.in b/corepkgs/config.nix.in index 3819dc96c164..a5ec83b9ea0c 100644 --- a/corepkgs/config.nix.in +++ b/corepkgs/config.nix.in @@ -4,7 +4,7 @@ let if val != "" then val else def; in { perl = "@perl@"; - shell = "@shell@"; + shell = "@bash@"; coreutils = "@coreutils@"; bzip2 = "@bzip2@"; gzip = "@gzip@"; diff --git a/corepkgs/local.mk b/corepkgs/local.mk new file mode 100644 index 000000000000..19c1d06962c0 --- /dev/null +++ b/corepkgs/local.mk @@ -0,0 +1,5 @@ +corepkgs_FILES = nar.nix buildenv.nix buildenv.pl unpack-channel.nix derivation.nix fetchurl.nix imported-drv-to-derivation.nix + +$(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/corepkgs))) + +template-files += $(d)/config.nix |