Fix lib functions taken from pkgs.lib instead of lib in nixos
Merge branch 'master' into zalora

Need fix for fully modular nixos