From b232587833cdf2e1c6a1a13fceebfd62728d06bd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 7 Sep 2019 13:12:20 -0500 Subject: [PATCH] fx_cast: use pname a bit more (cherry picked from commit a01a80a52c952bfa70a474cb062e508d3947ca6b) --- pkgs/tools/misc/fx_cast/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index bb723800f0c..e271960d73e 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.0.4"; src = fetchurl { - url = "https://github.com/hensm/fx_cast/releases/download/v${version}/fx_cast_bridge-${version}-x64.deb"; + url = "https://github.com/hensm/fx_cast/releases/download/v${version}/${pname}-${version}-x64.deb"; sha256 = "1p6d8idbaaqr80vxrmmyfcr5nwb0sk5vwrmizflg39p5zasmmhy2"; }; @@ -21,18 +21,18 @@ stdenv.mkDerivation rec { dontPatchELF = true; installPhase = '' - install -DT {opt/fx_cast,$out/bin}/fx_cast_bridge - install -DT {usr,$out}/lib/mozilla/native-messaging-hosts/fx_cast_bridge.json + install -DT {opt/fx_cast,$out/bin}/${pname} + install -DT {usr,$out}/lib/mozilla/native-messaging-hosts/${pname}.json - substituteInPlace $out/lib/mozilla/native-messaging-hosts/fx_cast_bridge.json \ - --replace {/opt/fx_cast,$out/bin}/fx_cast_bridge + substituteInPlace $out/lib/mozilla/native-messaging-hosts/${pname}.json \ + --replace {/opt/fx_cast,$out/bin}/${pname} ''; # See now-cli/default.nix dontStrip = true; preFixup = let libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc stdenv.cc.libc]; - bin = "$out/bin/fx_cast_bridge"; + bin = "$out/bin/${pname}"; in '' orig_size=$(stat --printf=%s ${bin})