Unverified Commit 429764b1 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

{simple64,inochi-session,inochi-creator}: use patchelf instead of LD_LIBRARY_PATH (#371154)

parents 164030b8 79394ca1

pkgs/applications/misc/inochi2d/generic.nix

+9 −7
Original line number Diff line number Diff line
@@ -131,8 +131,10 @@ buildDubPackage ( 
    postFixup = ''

      # Add support for `open file` dialog

      makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \

          --prefix PATH : ${lib.makeBinPath [ zenity ]} \

          --prefix LD_LIBRARY_PATH : ${

        --prefix PATH : ${lib.makeBinPath [ zenity ]}



      patchelf $out/share/${pname}/${pname} \

        --add-rpath ${

          lib.makeLibraryPath [

            libGL

            luajit_2_1

pkgs/by-name/si/simple64/package.nix

+4 −5
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ stdenv.mkDerivation (finalAttrs: { 


  dontUseCmakeConfigure = true;



  dontWrapQtApps = true;



  buildPhase = ''

    runHook preInstall
@@ -89,9 +87,10 @@ stdenv.mkDerivation (finalAttrs: { 


    install -Dm644 ./simple64-gui/icons/simple64.svg -t $out/share/icons/hicolor/scalable/apps/



    makeWrapper $out/share/simple64/simple64-gui $out/bin/simple64-gui \

        --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]} \

        "''${qtWrapperArgs[@]}"

    patchelf $out/share/simple64/simple64-gui \

      --add-needed libvulkan.so.1 --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]}



    ln -s $out/share/simple64/simple64-gui $out/bin/simple64-gui



    runHook postInstall

  '';