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

Remove corepkgs/derivation.nix

Browse source
This commit is contained in:
Eelco Dolstra 2020-09-17 09:12:39 +02:00
parent 5080d4e7b2
commit 10d1865f5f
4 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
corepkgs/local.mk
View file

@ -1,6 +1,5 @@
corepkgs_FILES = \ corepkgs_FILES = \
unpack-channel.nix \ unpack-channel.nix \
derivation.nix \
fetchurl.nix fetchurl.nix
$(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/corepkgs))) $(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/corepkgs)))

2
src/libexpr/local.mk
View file

@ -42,6 +42,6 @@ $(eval $(call install-file-in, $(d)/nix-expr.pc, $(prefix)/lib/pkgconfig, 0644))
$(foreach i, $(wildcard src/libexpr/flake/*.hh), \ $(foreach i, $(wildcard src/libexpr/flake/*.hh), \
$(eval $(call install-file-in, $(i), $(includedir)/nix/flake, 0644))) $(eval $(call install-file-in, $(i), $(includedir)/nix/flake, 0644)))
$(d)/primops.cc: $(d)/imported-drv-to-derivation.nix.gen.hh $(d)/primops.cc: $(d)/imported-drv-to-derivation.nix.gen.hh $(d)/primops/derivation.nix.gen.hh
$(d)/flake/flake.cc: $(d)/flake/call-flake.nix.gen.hh $(d)/flake/flake.cc: $(d)/flake/call-flake.nix.gen.hh

10
src/libexpr/primops.cc
View file

@ -3565,13 +3565,11 @@ void EvalState::createBaseEnv()
/* Add a wrapper around the derivation primop that computes the /* Add a wrapper around the derivation primop that computes the
`drvPath' and `outPath' attributes lazily. */ `drvPath' and `outPath' attributes lazily. */
try { sDerivationNix = symbols.create("//builtin/derivation.nix");
string path = canonPath(settings.nixDataDir + "/nix/corepkgs/derivation.nix", true); eval(parse(
sDerivationNix = symbols.create(path); #include "primops/derivation.nix.gen.hh"
evalFile(path, v); , foFile, sDerivationNix, "/", staticBaseEnv), v);
addConstant("derivation", v); addConstant("derivation", v);
} catch (SysError &) {
}
/* Now that we've added all primops, sort the `builtins' set, /* Now that we've added all primops, sort the `builtins' set,
because attribute lookups expect it to be sorted. */ because attribute lookups expect it to be sorted. */

0
corepkgs/derivation.nix → src/libexpr/primops/derivation.nix
View file