Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7879a6f95b1f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a0f1c301d90f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 9, 2020

  1. ncftp: do not override $TMPDIR

    @gebner
    gebner committed Sep 9, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: 02935DA8AF8674CB
    Learn about vigilant mode
    Copy the full SHA
    07999f4 View commit details

  2. Merge pull request #97584 from gebner/ncftp-tmpdir 

    ncftp: do not override $TMPDIR
    @gebner
    gebner authored Sep 9, 2020
    Copy the full SHA
    a0f1c30 View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 pkgs/tools/networking/ncftp/default.nix
2 changes: 2 additions & 0 deletions pkgs/tools/networking/ncftp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

preConfigure = ''
find -name Makefile.in | xargs sed -i '/^TMPDIR=/d'
find . -name '*.sh' -or -name '*.in' -or -name '*.c' -or -name configure | xargs sed -i \
-e 's@/bin/ls@${coreutils}/bin/ls@g' \
-e 's@/bin/rm@${coreutils}/bin/rm@g'