Unverified Commit 4d948d71 authored by Guy Chronister's avatar Guy Chronister
Browse files

alfaview: hardcode pname value in URL, switch to --replace-fail, finalAttrs

parent 09d963e5

pkgs/by-name/al/alfaview/package.nix

+7 −7
Original line number Diff line number Diff line
@@ -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" ];

  };

}
 
})