JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes #12403. I'm sorry for the problems. Thanks to @mdorman!
This commit is contained in:
Vladimír Čunát 2016-01-15 13:29:21 +01:00
parent 26bd247921
commit c29df5f8a7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -83,8 +83,8 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec {
'' ''
mkdir ../objdir mkdir ../objdir
cd ../objdir cd ../objdir
if [ -e ../${name} ]; then if [ -e ../${pname}-${version} ]; then
configureScript=../${name}/configure configureScript=../${pname}-${version}/configure
else else
configureScript=../mozilla-*/configure configureScript=../mozilla-*/configure
fi fi
@ -99,7 +99,7 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec {
postInstall = postInstall =
'' ''
# For grsecurity kernels # 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? # Remove SDK cruft. FIXME: move to a separate output?
rm -rf $out/share/idl $out/include $out/lib/firefox-devel-* rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*