diff options
author | Daniel Schaefer <git@danielschaefer.me> | 2019-08-10 03:07:04 +0200 |
---|---|---|
committer | Matthieu Coudron <coudron@iij.ad.jp> | 2019-08-11 01:53:08 +0900 |
commit | e1a548409858d3c109461c1560e98b0e3a5b6171 (patch) | |
tree | f01f404b60efcb6b94bdd40d0b0ed9812d9825ab | |
parent | 4a3aa14c32cc8e78f35431eb43bc132cc7e2e36d (diff) | |
download | nixlib-e1a548409858d3c109461c1560e98b0e3a5b6171.tar nixlib-e1a548409858d3c109461c1560e98b0e3a5b6171.tar.gz nixlib-e1a548409858d3c109461c1560e98b0e3a5b6171.tar.bz2 nixlib-e1a548409858d3c109461c1560e98b0e3a5b6171.tar.lz nixlib-e1a548409858d3c109461c1560e98b0e3a5b6171.tar.xz nixlib-e1a548409858d3c109461c1560e98b0e3a5b6171.tar.zst nixlib-e1a548409858d3c109461c1560e98b0e3a5b6171.zip |
pptp: Fix shebangs
- Remove `which` as build-time input - Use substituteInPlace instead of sed (warns if it fails to replace) - Use perl in buildInputs as it's a run-time dependency - Patch shebangs manually, not sure why fixupPhase doesn't do it
-rw-r--r-- | pkgs/tools/networking/pptp/default.nix | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 03270ce87881..6a97abfab590 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -1,26 +1,29 @@ -{ stdenv, fetchurl, perl, ppp, iproute, which }: +{ stdenv, fetchurl, perl, ppp, iproute }: stdenv.mkDerivation rec { - name = "pptp-${version}"; + pname = "pptp"; version = "1.10.0"; src = fetchurl { - url = "mirror://sourceforge/pptpclient/${name}.tar.gz"; + url = "mirror://sourceforge/pptpclient/${pname}-${version}.tar.gz"; sha256 = "1x2szfp96w7cag2rcvkdqbsl836ja5148zzfhaqp7kl7wjw2sjc2"; }; - patchPhase = - '' - sed -e 's/install -o root/install/' -i Makefile - ''; - preConfigure = - '' - makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ - BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ - PPPDIR=$out/etc/ppp ) - ''; + prePatch = '' + substituteInPlace Makefile --replace 'install -o root' 'install' + ''; - nativeBuildInputs = [ perl which ]; + preConfigure = '' + makeFlagsArray=( IP=${iproute}/bin/ip PPPD=${ppp}/sbin/pppd \ + BINDIR=$out/sbin MANDIR=$out/share/man/man8 \ + PPPDIR=$out/etc/ppp ) + ''; + + buildInputs = [ perl ]; + + postFixup = '' + patchShebangs $out + ''; meta = with stdenv.lib; { description = "PPTP client for Linux"; |