Merge pull request #86083 from tomberek/torque/cp

This commit is contained in:
Jörg Thalheim 2020-04-26 23:39:08 +01:00 committed by GitHub
commit aac4c8589c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux { stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux
, file, libtool, which, boost, autoreconfHook , coreutils, file, libtool, which, boost, autoreconfHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
--replace "contrib/init.d contrib/systemd" "" --replace "contrib/init.d contrib/systemd" ""
substituteInPlace src/cmds/Makefile.am \ substituteInPlace src/cmds/Makefile.am \
--replace "/etc/" "$out/etc/" --replace "/etc/" "$out/etc/"
substituteInPlace src/mom_rcp/pathnames.h \
--replace /bin/cp ${coreutils}/bin/cp
substituteInPlace src/resmom/requests.c \
--replace /bin/cp ${coreutils}/bin/cp
''; '';
preConfigure = '' preConfigure = ''