firefox: fixup ${name} problems introduced in 2e78e19

Fixes #12403. I'm sorry for the problems. Thanks to @mdorman!

Changed files
+3 -3
pkgs
applications
networking
browsers
firefox
+3 -3
pkgs/applications/networking/browsers/firefox/default.nix
···
''
mkdir ../objdir
cd ../objdir
-
if [ -e ../${name} ]; then
-
configureScript=../${name}/configure
+
if [ -e ../${pname}-${version} ]; then
+
configureScript=../${pname}-${version}/configure
else
configureScript=../mozilla-*/configure
fi
···
postInstall =
''
# For grsecurity kernels
-
paxmark m $out/lib/${name}/{firefox,firefox-bin,plugin-container}
+
paxmark m $out/lib/${pname}-${version}/{firefox,firefox-bin,plugin-container}
# Remove SDK cruft. FIXME: move to a separate output?
rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*