thc-hydra: --replace -> --replace-fail
--replace of substituteInPlace is deprecated
This commit is contained in:
parent
37586a7482
commit
a5317c3338
@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
|
|||||||
makeDirs = output: subDir: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) buildInputs);
|
makeDirs = output: subDir: lib.concatStringsSep " " (map (path: lib.getOutput output path + "/" + subDir) buildInputs);
|
||||||
in ''
|
in ''
|
||||||
substituteInPlace configure \
|
substituteInPlace configure \
|
||||||
--replace '$LIBDIRS' "${makeDirs "lib" "lib"}" \
|
--replace-fail '$LIBDIRS' "${makeDirs "lib" "lib"}" \
|
||||||
--replace '$INCDIRS' "${makeDirs "dev" "include"}" \
|
--replace-fail '$INCDIRS' "${makeDirs "dev" "include"}" \
|
||||||
--replace "/usr/include/math.h" "${lib.getDev stdenv.cc.libc}/include/math.h" \
|
--replace-fail "/usr/include/math.h" "${lib.getDev stdenv.cc.libc}/include/math.h" \
|
||||||
--replace "libcurses.so" "libncurses.so" \
|
--replace-fail "libcurses.so" "libncurses.so" \
|
||||||
--replace "-lcurses" "-lncurses"
|
--replace-fail "-lcurses" "-lncurses"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-undef-prefix";
|
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-undef-prefix";
|
||||||
|
Loading…
Reference in New Issue
Block a user