From 4d948d71fba6eda247f7b69ea85f995d03eed497 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Sun, 14 Sep 2025 14:34:53 +0000 Subject: [PATCH] alfaview: hardcode pname value in URL, switch to --replace-fail, finalAttrs --- pkgs/by-name/al/alfaview/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/al/alfaview/package.nix b/pkgs/by-name/al/alfaview/package.nix index fe9d38198f42..9c5cad8b3489 100644 --- a/pkgs/by-name/al/alfaview/package.nix +++ b/pkgs/by-name/al/alfaview/package.nix @@ -29,12 +29,12 @@ libx11, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "alfaview"; version = "9.24.1"; src = fetchurl { - url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; + url = "https://assets.alfaview.com/stable/linux/deb/alfaview_${finalAttrs.version}.deb"; hash = "sha256-vRo5ZD3yYTWhR6fbc/HFtBBbYuq3cGbxPuDlSt5D8XM="; }; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { libxcb-render-util ]; - libPath = lib.makeLibraryPath buildInputs; + libPath = lib.makeLibraryPath finalAttrs.buildInputs; dontBuild = true; dontConfigure = true; @@ -84,11 +84,11 @@ stdenv.mkDerivation rec { mv opt $out substituteInPlace $out/share/applications/alfaview.desktop \ - --replace "/opt/alfaview" "$out/bin" \ - --replace "/usr/share/pixmaps/alfaview_production.png" alfaview_production + --replace-fail "/opt/alfaview" "$out/bin" \ + --replace-fail "/usr/share/pixmaps/alfaview.png" alfaview makeWrapper $out/opt/alfaview/alfaview $out/bin/alfaview \ - --prefix LD_LIBRARY_PATH : ${libPath} + --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath} runHook postInstall ''; @@ -102,4 +102,4 @@ stdenv.mkDerivation rec { mainProgram = "alfaview"; platforms = [ "x86_64-linux" ]; }; -} +})