pyrox.dev
firefox: fixup ${name} problems introduced in 2e78e19
Fixes #12403. I'm sorry for the problems. Thanks to @mdorman!
+3
-3
pkgs/applications/networking/browsers/firefox/default.nix
+3
-3
pkgs/applications/networking/browsers/firefox/default.nix
···
83
''
84
mkdir ../objdir
85
cd ../objdir
86
-
if [ -e ../${name} ]; then
87
-
configureScript=../${name}/configure
88
else
89
configureScript=../mozilla-*/configure
90
fi
···
99
postInstall =
100
''
101
# For grsecurity kernels
102
-
paxmark m $out/lib/${name}/{firefox,firefox-bin,plugin-container}
103
104
# Remove SDK cruft. FIXME: move to a separate output?
105
rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
···
83
''
84
mkdir ../objdir
85
cd ../objdir
86
+
if [ -e ../${pname}-${version} ]; then
87
+
configureScript=../${pname}-${version}/configure
88
else
89
configureScript=../mozilla-*/configure
90
fi
···
99
postInstall =
100
''
101
# For grsecurity kernels
102
+
paxmark m $out/lib/${pname}-${version}/{firefox,firefox-bin,plugin-container}
103
104
# Remove SDK cruft. FIXME: move to a separate output?
105
rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*