diff options
author | Peter Hoeg <peter@hoeg.com> | 2018-05-16 22:46:15 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-16 22:46:15 +0800 |
commit | b04e939a13c2b5eb6aeedaabae414cb14966dbae (patch) | |
tree | 5af8fa6c1ee4d9e980a6114da3ecdb546cd49ddd /pkgs/tools/networking | |
parent | 75cc398b975290ea8a65525965bc15120fa589ae (diff) | |
parent | 99e61887844b20a1dae129322b1742796466b683 (diff) | |
download | nixlib-b04e939a13c2b5eb6aeedaabae414cb14966dbae.tar nixlib-b04e939a13c2b5eb6aeedaabae414cb14966dbae.tar.gz nixlib-b04e939a13c2b5eb6aeedaabae414cb14966dbae.tar.bz2 nixlib-b04e939a13c2b5eb6aeedaabae414cb14966dbae.tar.lz nixlib-b04e939a13c2b5eb6aeedaabae414cb14966dbae.tar.xz nixlib-b04e939a13c2b5eb6aeedaabae414cb14966dbae.tar.zst nixlib-b04e939a13c2b5eb6aeedaabae414cb14966dbae.zip |
Merge pull request #40591 from peterhoeg/f/mpack
mpack: fix up broken paths
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/mpack/default.nix | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix index 8c8b40bbd2e0..62cec7c41eef 100644 --- a/pkgs/tools/networking/mpack/default.nix +++ b/pkgs/tools/networking/mpack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { name = "mpack-1.6"; @@ -10,10 +10,31 @@ stdenv.mkDerivation rec { patches = [ ./build-fix.patch ]; - preConfigure = "configureFlags=--mandir=$out/share/man"; + postPatch = '' + for f in *.{c,man,pl,unix} ; do + substituteInPlace $f --replace /usr/tmp /tmp + done - meta = { + for f in unixpk.c ; do + substituteInPlace $f \ + --replace /usr/sbin /run/current-system/sw/bin + done + + # this just shuts up some warnings + for f in {decode,encode,part,unixos,unixpk,unixunpk,xmalloc}.c ; do + sed -i 'i#include <stdlib.h>' $f + done + ''; + + postInstall = '' + install -Dm644 -t $out/share/doc/mpack INSTALL README.* + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "Utilities for encoding and decoding binary files in MIME"; - platforms = stdenv.lib.platforms.linux; + license = licenses.free; + platforms = platforms.linux; }; } |