diff options
| author | Yureka <yuka@yuka.dev> | 2023-09-09 08:27:19 +0200 |
|---|---|---|
| committer | Yureka <yuka@yuka.dev> | 2023-09-09 08:27:19 +0200 |
| commit | ef69e91c609e209ee41632dc2273ded3a1ff329f (patch) | |
| tree | f95f193eda3846cfdfa2159cce94daa7c7b195a7 /pkgs/tools | |
| parent | b4fdbf27f24be0611f92dc4724e68cb2b93a96a7 (diff) | |
| parent | 83b98f9b352d9b84da2b1d4a2ec95cbce694388c (diff) | |
| download | nixlib-ef69e91c609e209ee41632dc2273ded3a1ff329f.tar nixlib-ef69e91c609e209ee41632dc2273ded3a1ff329f.tar.gz nixlib-ef69e91c609e209ee41632dc2273ded3a1ff329f.tar.bz2 nixlib-ef69e91c609e209ee41632dc2273ded3a1ff329f.tar.lz nixlib-ef69e91c609e209ee41632dc2273ded3a1ff329f.tar.xz nixlib-ef69e91c609e209ee41632dc2273ded3a1ff329f.tar.zst nixlib-ef69e91c609e209ee41632dc2273ded3a1ff329f.zip | |
Merge branch 'waf-cross' of https://github.com/atorres1985-contrib/nixpkgs into HEAD
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/blockhash/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/ndn-tools/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/networking/saldl/default.nix | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix index 9d7b613bbe0b..4f63cf90a3ae 100644 --- a/pkgs/tools/graphics/blockhash/default.nix +++ b/pkgs/tools/graphics/blockhash/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python3, pkg-config, imagemagick, waf }: +{ lib, stdenv, fetchFromGitHub, python3, pkg-config, imagemagick, wafHook }: stdenv.mkDerivation rec { pname = "blockhash"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0x3lvhnkb4c3pyq6p81qnnqimz35wpippiac506dgjx3b1848v35"; }; - nativeBuildInputs = [ python3 pkg-config waf.hook ]; + nativeBuildInputs = [ python3 pkg-config wafHook ]; buildInputs = [ imagemagick ]; strictDeps = true; diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index ea6c731f214e..1cbc6d403a9d 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -7,7 +7,7 @@ , openssl , pkg-config , sphinx -, waf +, wafHook }: stdenv.mkDerivation rec { @@ -32,10 +32,10 @@ stdenv.mkDerivation rec { EOF ''; - nativeBuildInputs = [ pkg-config sphinx waf.hook ]; + nativeBuildInputs = [ pkg-config sphinx wafHook ]; buildInputs = [ libpcap ndn-cxx openssl ]; - configureFlags = [ + wafConfigureFlags = [ "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" "--with-tests" diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix index c131a709f734..d02acb3100a7 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , pkg-config -, waf +, wafHook , python3 , asciidoc , docbook_xml_dtd_45 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - waf.hook + wafHook python3 asciidoc docbook_xml_dtd_45 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl libevent ]; - configureFlags = [ "--saldl-version ${version}" "--no-werror" ]; + wafConfigureFlags = [ "--saldl-version ${version}" "--no-werror" ]; outputs = [ "out" "man" ]; |