diff options
| author | numkem <numkem@numkem.org> | 2018-06-15 15:35:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-15 15:35:23 -0400 |
| commit | cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d (patch) | |
| tree | ad1269cffa620ce756c0533e438ac86febdf4add /pkgs/servers/computing/torque/default.nix | |
| parent | 47aa1da7a020e96764ef522c2d63398aa0332798 (diff) | |
| parent | 54ea1cd58aefde76f7ab2f63e955b9c622c70d1f (diff) | |
| download | nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.gz nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.bz2 nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.lz nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.xz nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.tar.zst nixlib-cfbef4a9e6e73f14fbfd5f0b8e9ef8966393976d.zip | |
Merge pull request #1 from NixOS/master
Sync with upstream
Diffstat (limited to 'pkgs/servers/computing/torque/default.nix')
| -rw-r--r-- | pkgs/servers/computing/torque/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index 6d0037f74bdb..35c830dff8a5 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -10,11 +10,15 @@ stdenv.mkDerivation rec { sha256 = "1qpsk3bla6b6m7m0i1xpr183yj79liy3p34xhnz1grgq0776wg5l"; }; - buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux libtool + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl flex bison groff libxml2 utillinux libtool which ]; enableParallelBuilding = true; + # added to fix build with gcc7 + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + preConfigure = '' substituteInPlace ./configure \ --replace '/usr/bin/file' '${file}/bin/file' @@ -29,8 +33,9 @@ stdenv.mkDerivation rec { for f in $(find ./ -name Makefile.in); do echo patching $f... - sed -i $f -e '/PBS_MKDIRS/d' + sed -i $f -e '/PBS_MKDIRS/d' -e '/chmod u+s/d' done + ''; postInstall = '' |