fix dynamically changing store dir

Author: haenoe

.gitignore

@@ -114,6 +114,7 @@ perl/Makefile.config
 
 # /tests/functional/derivation/
 /tests/functional/derivation/*.out
+/tests/functional/derivation/nix
 
 /perl/lib/Nix/Config.pm
 /perl/lib/Nix/Store.cc

tests/functional/derivation.sh

@@ -17,13 +17,16 @@ function diffAndAccept() {
 badDiff=0
 badExitCode=0
 
+export NIX_STORE_DIR="/nix/store"
+
 for i in derivation/*.nix; do
     i=$(basename "$i" .nix)
 
-    drvPath=$(nix-instantiate "derivation/$i.nix")
-    cp --no-preserve=mode "$drvPath" "derivation/$i.out"
+    drvPath=$(nix-instantiate --store ./derivation "derivation/$i.nix")
+
+    cp --no-preserve=mode "derivation/$drvPath" "derivation/$i.out"
 
-    sed -i "s!$TEST_ROOT!/nix!g" "derivation/$i.out"
+    sed -i "s!$(pwd)!/pwd!g" "derivation/$i.out"
 
     diffAndAccept "$i" out exp
 done

tests/functional/derivation/advanced-attributes-defaults.exp

@@ -1 +1 @@
-Derive([("out","/nix/store/ffq9l2kaqnm28ly8k5mfvj10jjw8fgkp-advanced-attributes-defaults","","")],[],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("builder","/bin/bash"),("name","advanced-attributes-defaults"),("out","/nix/store/ffq9l2kaqnm28ly8k5mfvj10jjw8fgkp-advanced-attributes-defaults"),("system","my-system")])
+Derive([("out","/nix/store/1qsc7svv43m4dw2prh6mvyf7cai5czji-advanced-attributes-defaults","","")],[],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("builder","/bin/bash"),("name","advanced-attributes-defaults"),("out","/nix/store/1qsc7svv43m4dw2prh6mvyf7cai5czji-advanced-attributes-defaults"),("system","my-system")])

tests/functional/derivation/advanced-attributes-structured-attrs-defaults.exp

@@ -1 +1 @@
-Derive([("dev","/nix/store/d4d9cwmwllap7r9l219mlg1y54i3w3rj-advanced-attributes-structured-attrs-defaults-dev","",""),("out","/nix/store/f1qwnfhhhwazggqkjmd3vwhnkm3avigm-advanced-attributes-structured-attrs-defaults","","")],[],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("__json","{\"builder\":\"/bin/bash\",\"name\":\"advanced-attributes-structured-attrs-defaults\",\"outputs\":[\"out\",\"dev\"],\"system\":\"my-system\"}"),("dev","/nix/store/d4d9cwmwllap7r9l219mlg1y54i3w3rj-advanced-attributes-structured-attrs-defaults-dev"),("out","/nix/store/f1qwnfhhhwazggqkjmd3vwhnkm3avigm-advanced-attributes-structured-attrs-defaults")])
+Derive([("dev","/nix/store/8bazivnbipbyi569623skw5zm91z6kc2-advanced-attributes-structured-attrs-defaults-dev","",""),("out","/nix/store/f8f8nvnx32bxvyxyx2ff7akbvwhwd9dw-advanced-attributes-structured-attrs-defaults","","")],[],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("__json","{\"builder\":\"/bin/bash\",\"name\":\"advanced-attributes-structured-attrs-defaults\",\"outputs\":[\"out\",\"dev\"],\"system\":\"my-system\"}"),("dev","/nix/store/8bazivnbipbyi569623skw5zm91z6kc2-advanced-attributes-structured-attrs-defaults-dev"),("out","/nix/store/f8f8nvnx32bxvyxyx2ff7akbvwhwd9dw-advanced-attributes-structured-attrs-defaults")])

tests/functional/derivation/advanced-attributes-structured-attrs.exp

@@ -1 +1 @@
-Derive([("bin","/nix/store/wksnxzm4r225jycnxhszv03fmq84bplh-advanced-attributes-structured-attrs-bin","",""),("dev","/nix/store/cg9hs77dv36zy96jq8hppg56acxvd671-advanced-attributes-structured-attrs-dev","",""),("out","/nix/store/8wbm9r4lm0plnrxfjbprj7gdzxyn81yb-advanced-attributes-structured-attrs","","")],[("/nix/store/87z2dcw3iqp6m9qb8wl7kz6gxbv5npfj-bar.drv",["out"]),("/nix/store/zbnrdv6xxa4hqd4vph45y4a34bgz2nc9-foo.drv",["out"])],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("__json","{\"__darwinAllowLocalNetworking\":true,\"__impureHostDeps\":[\"/usr/bin/ditto\"],\"__noChroot\":true,\"__sandboxProfile\":\"sandcastle\",\"allowSubstitutes\":false,\"builder\":\"/bin/bash\",\"impureEnvVars\":[\"UNICORN\"],\"name\":\"advanced-attributes-structured-attrs\",\"outputChecks\":{\"bin\":{\"disallowedReferences\":[\"/nix/store/y1qkvd0lxmwsrzbcck3dnv4rqgfry2h0-bar\"],\"disallowedRequisites\":[\"/nix/store/y1qkvd0lxmwsrzbcck3dnv4rqgfry2h0-bar\"]},\"dev\":{\"maxClosureSize\":5909,\"maxSize\":789},\"out\":{\"allowedReferences\":[\"/nix/store/wbqv1hq7d2cbs16w1cx2j0sgvqa5cjwj-foo\"],\"allowedRequisites\":[\"/nix/store/wbqv1hq7d2cbs16w1cx2j0sgvqa5cjwj-foo\"]}},\"outputs\":[\"out\",\"bin\",\"dev\"],\"preferLocalBuild\":true,\"requiredSystemFeatures\":[\"rainbow\",\"uid-range\"],\"system\":\"my-system\"}"),("bin","/nix/store/wksnxzm4r225jycnxhszv03fmq84bplh-advanced-attributes-structured-attrs-bin"),("dev","/nix/store/cg9hs77dv36zy96jq8hppg56acxvd671-advanced-attributes-structured-attrs-dev"),("out","/nix/store/8wbm9r4lm0plnrxfjbprj7gdzxyn81yb-advanced-attributes-structured-attrs")])
+Derive([("bin","/nix/store/pbzb48v0ycf80jgligcp4n8z0rblna4n-advanced-attributes-structured-attrs-bin","",""),("dev","/nix/store/7xapi8jv7flcz1qq8jhw55ar8ag8hldh-advanced-attributes-structured-attrs-dev","",""),("out","/nix/store/mpq3l1l1qc2yr50q520g08kprprwv79f-advanced-attributes-structured-attrs","","")],[("/nix/store/4xm4wccqsvagz9gjksn24s7rip2fdy7v-foo.drv",["out"]),("/nix/store/plsq5jbr5nhgqwcgb2qxw7jchc09dnl8-bar.drv",["out"])],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("__json","{\"__darwinAllowLocalNetworking\":true,\"__impureHostDeps\":[\"/usr/bin/ditto\"],\"__noChroot\":true,\"__sandboxProfile\":\"sandcastle\",\"allowSubstitutes\":false,\"builder\":\"/bin/bash\",\"impureEnvVars\":[\"UNICORN\"],\"name\":\"advanced-attributes-structured-attrs\",\"outputChecks\":{\"bin\":{\"disallowedReferences\":[\"/nix/store/7rhsm8i393hm1wcsmph782awg1hi2f7x-bar\"],\"disallowedRequisites\":[\"/nix/store/7rhsm8i393hm1wcsmph782awg1hi2f7x-bar\"]},\"dev\":{\"maxClosureSize\":5909,\"maxSize\":789},\"out\":{\"allowedReferences\":[\"/nix/store/3c08bzb71z4wiag719ipjxr277653ynp-foo\"],\"allowedRequisites\":[\"/nix/store/3c08bzb71z4wiag719ipjxr277653ynp-foo\"]}},\"outputs\":[\"out\",\"bin\",\"dev\"],\"preferLocalBuild\":true,\"requiredSystemFeatures\":[\"rainbow\",\"uid-range\"],\"system\":\"my-system\"}"),("bin","/nix/store/pbzb48v0ycf80jgligcp4n8z0rblna4n-advanced-attributes-structured-attrs-bin"),("dev","/nix/store/7xapi8jv7flcz1qq8jhw55ar8ag8hldh-advanced-attributes-structured-attrs-dev"),("out","/nix/store/mpq3l1l1qc2yr50q520g08kprprwv79f-advanced-attributes-structured-attrs")])

tests/functional/derivation/advanced-attributes.exp

@@ -1 +1 @@
-Derive([("out","/nix/store/bq23371vkg6ny82yaflnqaqjqd01b0p5-advanced-attributes","","")],[("/nix/store/87z2dcw3iqp6m9qb8wl7kz6gxbv5npfj-bar.drv",["out"]),("/nix/store/zbnrdv6xxa4hqd4vph45y4a34bgz2nc9-foo.drv",["out"])],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("__darwinAllowLocalNetworking","1"),("__impureHostDeps","/usr/bin/ditto"),("__noChroot","1"),("__sandboxProfile","sandcastle"),("allowSubstitutes",""),("allowedReferences","/nix/store/wbqv1hq7d2cbs16w1cx2j0sgvqa5cjwj-foo"),("allowedRequisites","/nix/store/wbqv1hq7d2cbs16w1cx2j0sgvqa5cjwj-foo"),("builder","/bin/bash"),("disallowedReferences","/nix/store/y1qkvd0lxmwsrzbcck3dnv4rqgfry2h0-bar"),("disallowedRequisites","/nix/store/y1qkvd0lxmwsrzbcck3dnv4rqgfry2h0-bar"),("impureEnvVars","UNICORN"),("name","advanced-attributes"),("out","/nix/store/bq23371vkg6ny82yaflnqaqjqd01b0p5-advanced-attributes"),("preferLocalBuild","1"),("requiredSystemFeatures","rainbow uid-range"),("system","my-system")])
+Derive([("out","/nix/store/33a6fdmn8q9ih9d7npbnrxn2q56a4l8q-advanced-attributes","","")],[("/nix/store/4xm4wccqsvagz9gjksn24s7rip2fdy7v-foo.drv",["out"]),("/nix/store/plsq5jbr5nhgqwcgb2qxw7jchc09dnl8-bar.drv",["out"])],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("__darwinAllowLocalNetworking","1"),("__impureHostDeps","/usr/bin/ditto"),("__noChroot","1"),("__sandboxProfile","sandcastle"),("allowSubstitutes",""),("allowedReferences","/nix/store/3c08bzb71z4wiag719ipjxr277653ynp-foo"),("allowedRequisites","/nix/store/3c08bzb71z4wiag719ipjxr277653ynp-foo"),("builder","/bin/bash"),("disallowedReferences","/nix/store/7rhsm8i393hm1wcsmph782awg1hi2f7x-bar"),("disallowedRequisites","/nix/store/7rhsm8i393hm1wcsmph782awg1hi2f7x-bar"),("impureEnvVars","UNICORN"),("name","advanced-attributes"),("out","/nix/store/33a6fdmn8q9ih9d7npbnrxn2q56a4l8q-advanced-attributes"),("preferLocalBuild","1"),("requiredSystemFeatures","rainbow uid-range"),("system","my-system")])

tests/unit/libstore/data/derivation/advanced-attributes-defaults.drv

@@ -0,0 +1 @@
+../../../../functional/derivation/advanced-attributes-defaults.exp

tests/unit/libstore/data/derivation/advanced-attributes-defaults.drv

@@ -7,15 +7,15 @@
   "env": {
     "builder": "/bin/bash",
     "name": "advanced-attributes-defaults",
-    "out": "/nix/store/gm96g8g5dy5299pa9wjzg3n9m4gc1ybf-advanced-attributes-defaults",
+    "out": "/nix/store/1qsc7svv43m4dw2prh6mvyf7cai5czji-advanced-attributes-defaults",
     "system": "my-system"
   },
   "inputDrvs": {},
   "inputSrcs": [],
   "name": "advanced-attributes-defaults",
   "outputs": {
     "out": {
-      "path": "/nix/store/gm96g8g5dy5299pa9wjzg3n9m4gc1ybf-advanced-attributes-defaults"
+      "path": "/nix/store/1qsc7svv43m4dw2prh6mvyf7cai5czji-advanced-attributes-defaults"
     }
   },
   "system": "my-system"