@@ -1,5 +1,5 @@
11{ stdenv, lib, makeDesktopItem, makeWrapper, lndir, config
2−, replace, fetchurl, zip, unzip, jq, xdg_utils
2+, replace, fetchurl, zip, unzip, jq, xdg_utils, writeText
33
44## various stuff that can be plugged in
55, flashplayer, hal-flash
@@ -97,12 +97,17 @@ let
9797 # EXTRA PREF CHANGES #
9898 # #
9999 #########################
100− policiesJson = builtins.toFile "policies.json"
101− (builtins.toJSON enterprisePolicies);
100+ policiesJson = writeText "policies.json" (builtins.toJSON enterprisePolicies);
102101
103102 usesNixExtensions = nixExtensions != null;
104103
105− extensions = builtins.map (a:
104+ nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []);
105+
106+ # Check that every extension has a unqiue .name attribute
107+ # and an extid attribute
108+ extensions = if nameArray != (lib.unique nameArray) then
109+ throw "Firefox addon name needs to be unique"
110+ else builtins.map (a:
106111 if ! (builtins.hasAttr "extid" a) then
107112 throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon"
108113 else
@@ -128,12 +133,19 @@ let
128133 };
129134 }
130135 ) {} extensions;
131− }
136+ } //
137+ {
138+ Extensions = {
139+ Install = lib.foldr (e: ret:
140+ ret ++ [ "${e.outPath}/${e.extid}.xpi" ]
141+ ) [] extensions;
142+ };
143+ }
132144 // extraPolicies;
133145 };
134146
135− mozillaCfg = builtins.toFile "mozilla.cfg" ''
136−// First line must be a comment
147+ mozillaCfg = writeText "mozilla.cfg" ''
148+ // First line must be a comment
137149
138150 // Disables addon signature checking
139151 // to be able to install addons that do not have an extid
@@ -320,18 +332,13 @@ let
320332 # preparing for autoconfig
321333 mkdir -p "$out/lib/${firefoxLibName}/defaults/pref"
322334
323− cat > "$out/lib/${firefoxLibName}/defaults/pref/autoconfig.js" <<EOF
324− pref("general.config.filename", "mozilla.cfg");
325− pref("general.config.obscure_value", 0);
326− EOF
335+ echo 'pref("general.config.filename", "mozilla.cfg");' > "$out/lib/${firefoxLibName}/defaults/pref/autoconfig.js"
336+ echo 'pref("general.config.obscure_value", 0);' >> "$out/lib/${firefoxLibName}/defaults/pref/autoconfig.js"
327337
328338 cat > "$out/lib/${firefoxLibName}/mozilla.cfg" < ${mozillaCfg}
329339
330340 mkdir -p $out/lib/${firefoxLibName}/distribution/extensions
331341
332− for i in ${toString extensions}; do
333− ln -s -t $out/lib/${firefoxLibName}/distribution/extensions $i/*
334− done
335342 #############################
336343 # #
337344 # END EXTRA PREF CHANGES #