diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-16 18:51:23 +0700 |
|---|---|---|
| committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-02-20 01:02:08 +0700 |
| commit | 4b2c44c0a7ad50207c43e286e7946715b985a188 (patch) | |
| tree | df7746351ab313e8efe7109b482d563d986c850f /pkgs/tools | |
| parent | 223f25cf4a2ca9e2b35801eb0c43540151df89b9 (diff) | |
| download | nixpkgs-4b2c44c0a7ad50207c43e286e7946715b985a188.tar nixpkgs-4b2c44c0a7ad50207c43e286e7946715b985a188.tar.gz nixpkgs-4b2c44c0a7ad50207c43e286e7946715b985a188.tar.bz2 nixpkgs-4b2c44c0a7ad50207c43e286e7946715b985a188.tar.lz nixpkgs-4b2c44c0a7ad50207c43e286e7946715b985a188.tar.xz nixpkgs-4b2c44c0a7ad50207c43e286e7946715b985a188.tar.zst nixpkgs-4b2c44c0a7ad50207c43e286e7946715b985a188.zip | |
treewide: drop conditional makeFlag for darwin when specifiying cross-compiler
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/compression/hactool/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/haproxy/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/apg/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/boxes/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix index f3c80fd7a0d..c6e0a3a2851 100644 --- a/pkgs/tools/compression/hactool/default.nix +++ b/pkgs/tools/compression/hactool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { mv config.mk.template config.mk ''; - makeFlags = lib.optionals stdenv.isDarwin [ "CC=${stdenv.cc.targetPrefix}cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -D hactool $out/bin/hactool diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index caf78c3d0b3..a682e15891f 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "USE_GETADDRINFO=1" ] ++ lib.optionals withPrometheusExporter [ "EXTRA_OBJS=contrib/prometheus-exporter/service-prometheus.o" - ] ++ lib.optional stdenv.isDarwin "CC=${stdenv.cc.targetPrefix}cc"; + ] ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index b90c61d1ff6..a185c09bda6 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" ''; - makeFlags = lib.optionals stdenv.isDarwin ["CC=${stdenv.cc.targetPrefix}cc"]; + makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"]; patches = [ ./apg.patch diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/tools/text/boxes/default.nix index 892c7976faa..f39349b2fbf 100644 --- a/pkgs/tools/text/boxes/default.nix +++ b/pkgs/tools/text/boxes/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "GLOBALCONF=${placeholder "out"}/share/boxes/boxes-config" ''; - makeFlags = lib.optionals stdenv.isDarwin [ "CC=${stdenv.cc.targetPrefix}cc" ]; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' install -Dm755 -t $out/bin src/boxes |