diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-15 13:29:21 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-15 13:32:36 +0100 |
| commit | c29df5f8a7122fbc9411765156ab42c12baadbbb (patch) | |
| tree | 4ae46e35e2a60f97071b02fed495e03de6d7ff7c /pkgs | |
| parent | 26bd247921cd7373e06df473fa6d683fda37ed77 (diff) | |
| download | nixlib-c29df5f8a7122fbc9411765156ab42c12baadbbb.tar nixlib-c29df5f8a7122fbc9411765156ab42c12baadbbb.tar.gz nixlib-c29df5f8a7122fbc9411765156ab42c12baadbbb.tar.bz2 nixlib-c29df5f8a7122fbc9411765156ab42c12baadbbb.tar.lz nixlib-c29df5f8a7122fbc9411765156ab42c12baadbbb.tar.xz nixlib-c29df5f8a7122fbc9411765156ab42c12baadbbb.tar.zst nixlib-c29df5f8a7122fbc9411765156ab42c12baadbbb.zip | |
firefox: fixup ${name} problems introduced in 2e78e19
Fixes #12403. I'm sorry for the problems. Thanks to @mdorman!
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 846c79d0b746..566247fc0d43 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -83,8 +83,8 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec { '' 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 @@ -99,7 +99,7 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec { 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-* |