summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristoph Heiss <christoph@c8h4.io>2023-10-10 17:35:11 +0200
committerChristoph Heiss <christoph@c8h4.io>2023-10-12 17:25:52 +0200
commite51dee59de9457044c41ca7fcadd94f2a17bc57d (patch)
treee4da246404ffb28e09e89e78ea2b89914b42a156
parentf7858dc1ceb0e93df246ee018ecc76c2e6eef7be (diff)
downloadnixpkgs-e51dee59de9457044c41ca7fcadd94f2a17bc57d.tar
nixpkgs-e51dee59de9457044c41ca7fcadd94f2a17bc57d.tar.gz
nixpkgs-e51dee59de9457044c41ca7fcadd94f2a17bc57d.tar.bz2
nixpkgs-e51dee59de9457044c41ca7fcadd94f2a17bc57d.tar.lz
nixpkgs-e51dee59de9457044c41ca7fcadd94f2a17bc57d.tar.xz
nixpkgs-e51dee59de9457044c41ca7fcadd94f2a17bc57d.tar.zst
nixpkgs-e51dee59de9457044c41ca7fcadd94f2a17bc57d.zip
buildMozillaMach: allow distinct source and package versions
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
-rw-r--r--pkgs/applications/networking/browsers/firefox/common.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index bb4b1ba0a85..8a9cc71d083 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -1,5 +1,6 @@
 { pname
 , version
+, packageVersion ? version
 , meta
 , updateScript ? null
 , binaryName ? "firefox"
@@ -206,7 +207,7 @@ in
 
 buildStdenv.mkDerivation {
   pname = "${pname}-unwrapped";
-  inherit version;
+  version = packageVersion;
 
   inherit src unpackPhase meta;
 
@@ -557,7 +558,6 @@ buildStdenv.mkDerivation {
   passthru = {
     inherit application extraPatches;
     inherit updateScript;
-    inherit version;
     inherit alsaSupport;
     inherit binaryName;
     inherit jackSupport;
@@ -569,6 +569,7 @@ buildStdenv.mkDerivation {
     inherit tests;
     inherit gtk3;
     inherit wasiSysRoot;
+    version = packageVersion;
   } // extraPassthru;
 
   hardeningDisable = [ "format" ]; # -Werror=format-security