Remove trailing whitespaces and fix indentation
This commit is contained in:
parent
e52f7881ef
commit
f6fceb321b
@ -73,7 +73,7 @@ let
|
|||||||
"--enable-libssp"
|
"--enable-libssp"
|
||||||
"--disable-nls"
|
"--disable-nls"
|
||||||
# To keep ABI compatibility with upstream mingw-w64
|
# To keep ABI compatibility with upstream mingw-w64
|
||||||
"--enable-fully-dynamic-string"
|
"--enable-fully-dynamic-string"
|
||||||
] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [
|
] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [
|
||||||
# See Note [Windows Exception Handling]
|
# See Note [Windows Exception Handling]
|
||||||
"--enable-sjlj-exceptions"
|
"--enable-sjlj-exceptions"
|
||||||
@ -187,10 +187,10 @@ let
|
|||||||
"--disable-symvers"
|
"--disable-symvers"
|
||||||
"libat_cv_have_ifunc=no"
|
"libat_cv_have_ifunc=no"
|
||||||
"--disable-gnu-indirect-function"
|
"--disable-gnu-indirect-function"
|
||||||
]
|
]
|
||||||
++ lib.optionals langJit [
|
++ lib.optionals langJit [
|
||||||
"--enable-host-shared"
|
"--enable-host-shared"
|
||||||
]
|
]
|
||||||
++ lib.optionals (langD) [
|
++ lib.optionals (langD) [
|
||||||
"--with-target-system-zlib=yes"
|
"--with-target-system-zlib=yes"
|
||||||
]
|
]
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
, fetchPypi
|
, fetchPypi
|
||||||
, pytest
|
, pytest
|
||||||
, markupsafe
|
, markupsafe
|
||||||
, setuptools
|
, setuptools
|
||||||
}:
|
}:
|
||||||
|
|
||||||
buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
|
@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
|
|||||||
''
|
''
|
||||||
substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file"
|
substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file"
|
||||||
sed -i "includes/dhcpd.h" \
|
sed -i "includes/dhcpd.h" \
|
||||||
-"es|^ *#define \+_PATH_DHCLIENT_SCRIPT.*$|#define _PATH_DHCLIENT_SCRIPT \"$out/sbin/dhclient-script\"|g"
|
-e "s|^ *#define \+_PATH_DHCLIENT_SCRIPT.*$|#define _PATH_DHCLIENT_SCRIPT \"$out/sbin/dhclient-script\"|g"
|
||||||
|
|
||||||
export AR='${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar'
|
export AR='${stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar'
|
||||||
'';
|
'';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user