Unverified Commit b338f67c authored by Ivan Mincik's avatar Ivan Mincik Committed by GitHub
Browse files

qgis{,-ltr}: wrap all binaries

parents 249743d1 a5e11d78

pkgs/applications/gis/qgis/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ in symlinkJoin rec { 
  pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.py.pkgs);



  postBuild = ''

    # unpackPhase



    buildPythonPath "$pythonInputs"



    wrapProgram $out/bin/qgis \

    for program in $out/bin/*; do

      wrapProgram $program \

        --prefix PATH : $program_PATH \

        --set PYTHONPATH $program_PYTHONPATH

    done

  '';



  passthru = {

pkgs/applications/gis/qgis/ltr.nix

+5 −5
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ in symlinkJoin rec { 
  pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs);



  postBuild = ''

    # unpackPhase



    buildPythonPath "$pythonInputs"



    wrapProgram $out/bin/qgis \

    for program in $out/bin/*; do

      wrapProgram $program \

        --prefix PATH : $program_PATH \

        --set PYTHONPATH $program_PYTHONPATH

    done

  '';



  passthru = {

pkgs/applications/gis/qgis/unwrapped-ltr.nix

+5 −3
Original line number Diff line number Diff line
@@ -173,9 +173,11 @@ in mkDerivation rec { 
    # the path at build time using GRASS_PREFIX.

    # Using wrapGAppsHook also prevents file dialogs from crashing the program

    # on non-NixOS.

    wrapProgram $out/bin/qgis \

    for program in $out/bin/*; do

      wrapProgram $program \

        "''${gappsWrapperArgs[@]}" \

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

    done

  '';



  meta = with lib; {

pkgs/applications/gis/qgis/unwrapped.nix

+5 −3
Original line number Diff line number Diff line
@@ -175,9 +175,11 @@ in mkDerivation rec { 
    # the path at build time using GRASS_PREFIX.

    # Using wrapGAppsHook also prevents file dialogs from crashing the program

    # on non-NixOS.

    wrapProgram $out/bin/qgis \

    for program in $out/bin/*; do

      wrapProgram $program \

        "''${gappsWrapperArgs[@]}" \

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

    done

  '';



  meta = with lib; {