Remove trailing whitespaces and fix indentation

wip/yesman
luc65r 4 years ago committed by Frederik Rietdijk
parent e52f7881ef
commit f6fceb321b
  1. 6
      pkgs/development/compilers/gcc/common/configure-flags.nix
  2. 2
      pkgs/development/python-modules/jinja2/default.nix
  3. 2
      pkgs/tools/networking/dhcp/default.nix

@ -73,7 +73,7 @@ let
"--enable-libssp"
"--disable-nls"
# To keep ABI compatibility with upstream mingw-w64
"--enable-fully-dynamic-string"
"--enable-fully-dynamic-string"
] ++ lib.optionals (crossMingw && targetPlatform.isx86_32) [
# See Note [Windows Exception Handling]
"--enable-sjlj-exceptions"
@ -187,10 +187,10 @@ let
"--disable-symvers"
"libat_cv_have_ifunc=no"
"--disable-gnu-indirect-function"
]
]
++ lib.optionals langJit [
"--enable-host-shared"
]
]
++ lib.optionals (langD) [
"--with-target-system-zlib=yes"
]

@ -4,7 +4,7 @@
, fetchPypi
, pytest
, markupsafe
, setuptools
, setuptools
}:
buildPythonPackage rec {

@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
''
substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file"
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'
'';

Loading…
Cancel
Save