From e59b23d062fa282d6aec29572b709af48113b881 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 19 Jan 2023 15:07:45 +0200 Subject: [PATCH] treewide: remove accidentally introduced -l they were all removed in c2b898da7623a39e3c9b6265d311fe182aa526f0 but these changes were made before that and merged after it --- nixos/tests/tracee.nix | 2 +- pkgs/development/python-modules/pyqt/6.x.nix | 2 +- pkgs/development/python-modules/pyqt6-webengine.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/tracee.nix b/nixos/tests/tracee.nix index 72e82ec0b7e..6ef7e5342be 100644 --- a/nixos/tests/tracee.nix +++ b/nixos/tests/tracee.nix @@ -18,7 +18,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { buildPhase = '' runHook preBuild # just build the static lib we need for the go test binary - make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES} bpf-core ./dist/btfhub + make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES} bpf-core ./dist/btfhub # remove the /usr/bin prefix to work with the patch above substituteInPlace tests/integration/integration_test.go \ diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index 00933da8471..b28a99cc662 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { # pkgs/development/interpreters/python/hooks/pip-build-hook.sh # does not use the enableParallelBuilding flag postUnpack = '' - export MAKEFLAGS+=" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES" + export MAKEFLAGS+=" -j$NIX_BUILD_CORES" ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/pyqt6-webengine.nix b/pkgs/development/python-modules/pyqt6-webengine.nix index 96fa057a47c..564d1a14325 100644 --- a/pkgs/development/python-modules/pyqt6-webengine.nix +++ b/pkgs/development/python-modules/pyqt6-webengine.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { # pkgs/development/interpreters/python/hooks/pip-build-hook.sh # does not use the enableParallelBuilding flag postUnpack = '' - export MAKEFLAGS+=" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES" + export MAKEFLAGS+=" -j$NIX_BUILD_CORES" ''; outputs = [ "out" "dev" ];