Unverified Commit 50983f16 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #229154: staging: make wrapProgram<Type> use the right wrapper 

...into staging
parents 0905eb98 a2332386

pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ wrapProgramBinary() { 
      hidden="${hidden}_"

    done

    mv "$prog" "$hidden"

    makeWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"

    makeBinaryWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"

}



# Generate source code for the wrapper in such a way that the wrapper inputs

pkgs/build-support/setup-hooks/make-wrapper.sh

+1 −1
Original line number Diff line number Diff line
@@ -217,5 +217,5 @@ wrapProgramShell() { 
      hidden="${hidden}_"

    done

    mv "$prog" "$hidden"

    makeWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"

    makeShellWrapper "$hidden" "$prog" --inherit-argv0 "${@:2}"

}

pkgs/tools/graphics/gnuplot/default.nix

+8 −1
Original line number Diff line number Diff line
@@ -53,11 +53,18 @@ in 


  CXXFLAGS = lib.optionalString (stdenv.isDarwin && withQt) "-std=c++11";



  # we'll wrap things ourselves

  dontWrapGApps = true;

  dontWrapQtApps = true;



  # binary wrappers don't support --run

  postInstall = lib.optionalString withX ''

    wrapProgram $out/bin/gnuplot \

    wrapProgramShell $out/bin/gnuplot \

       --prefix PATH : '${gnused}/bin' \

       --prefix PATH : '${coreutils}/bin' \

       --prefix PATH : '${fontconfig.bin}/bin' \

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

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

       --run '. ${./set-gdfontpath-from-fontconfig.sh}'

  '';