diff options
author | Mark H Weaver <mhw@netris.org> | 2015-01-06 12:57:15 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-01-06 12:57:15 -0500 |
commit | 23800e47361304682914314b99cfd4f3926f28e3 (patch) | |
tree | e67d984ab5961a81c8b8c6396c79cb218fecda85 /nix/libstore/misc.cc | |
parent | 9b1bf33081652210502c6ef34506e27a9bc60f06 (diff) | |
parent | aebb05b09502be00fb121f9c6cd74a190fb12a1c (diff) | |
download | guix-patches-23800e47361304682914314b99cfd4f3926f28e3.tar guix-patches-23800e47361304682914314b99cfd4f3926f28e3.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix/libstore/misc.cc')
-rw-r--r-- | nix/libstore/misc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nix/libstore/misc.cc b/nix/libstore/misc.cc index 1bf3f93782..6ecf8787cf 100644 --- a/nix/libstore/misc.cc +++ b/nix/libstore/misc.cc @@ -11,7 +11,7 @@ Derivation derivationFromPath(StoreAPI & store, const Path & drvPath) { assertStorePath(drvPath); store.ensurePath(drvPath); - return parseDerivation(readFile(drvPath)); + return readDerivation(drvPath); } |