diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-26 08:26:45 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-26 09:13:58 +0100 |
| commit | ec4685cf709ed10727f92bc30182f5c145e3f6bf (patch) | |
| tree | 3f7a7eb98ac1135bb4f56e74b1c59d4b9f0a6032 | |
| parent | 45a2d9e177737aff5fae21854c5420804a59743b (diff) | |
| download | nixlib-ec4685cf709ed10727f92bc30182f5c145e3f6bf.tar nixlib-ec4685cf709ed10727f92bc30182f5c145e3f6bf.tar.gz nixlib-ec4685cf709ed10727f92bc30182f5c145e3f6bf.tar.bz2 nixlib-ec4685cf709ed10727f92bc30182f5c145e3f6bf.tar.lz nixlib-ec4685cf709ed10727f92bc30182f5c145e3f6bf.tar.xz nixlib-ec4685cf709ed10727f92bc30182f5c145e3f6bf.tar.zst nixlib-ec4685cf709ed10727f92bc30182f5c145e3f6bf.zip | |
firefox-esr: fix build after 574a6d34d2
We're now using only newer versions that have ./configure in the root.
${pname} isn't the correct directory name for esr versions.
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 9089af711b78..41f8cc155a8e 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -81,13 +81,9 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec { preConfigure = '' + configureScript="$(realpath ./configure)" mkdir ../objdir cd ../objdir - if [ -e ../${pname}-${version} ]; then - configureScript=../${pname}-${version}/configure - else - configureScript=../mozilla-*/configure - fi ''; preInstall = |