diff options
| author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-11-26 18:44:44 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2015-11-26 23:45:31 +0100 |
| commit | 2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c (patch) | |
| tree | 64bf789924f9b17cf4ab32f75692c0c10ed4f2f6 /pkgs/development | |
| parent | 8fe518e763917f478dc5e76eae7b2aea9c582cad (diff) | |
| download | nixpkgs-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.tar nixpkgs-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.tar.gz nixpkgs-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.tar.bz2 nixpkgs-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.tar.lz nixpkgs-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.tar.xz nixpkgs-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.tar.zst nixpkgs-2798b02ad03ebdc104fecc6439c0bcf5bb32fe6c.zip | |
Convert some *Flags from strings to lists
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libcli/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libpsl/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/analysis/include-what-you-use/default.nix | 15 |
3 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index 0b3f46ab195..7798eb5f8fc 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Emulate a Cisco-style telnet command-line interface"; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index caec3c17225..95370b92111 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation { # The libpsl check phase requires the list's test scripts (tests/) as well cp -Rv "${listSources}"/* list ''; - configureFlags = "--disable-static --enable-gtk-doc --enable-man"; + configureFlags = [ "--disable-static" "--enable-gtk-doc" "--enable-man" ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index 577d058beb1..57d5cadf98c 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -11,7 +11,15 @@ in stdenv.mkDerivation rec { url = "${meta.homepage}/downloads/${name}.src.tar.gz"; }; + buildInputs = with llvmPackages; [ clang llvm ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}" ]; + + enableParallelBuilding = true; + meta = with stdenv.lib; { + inherit version; description = "Analyze #includes in C/C++ source files with clang"; longDescription = '' For every symbol (type, function variable, or macro) that you use in @@ -26,11 +34,4 @@ in stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - buildInputs = with llvmPackages; [ clang llvm ]; - nativeBuildInputs = [ cmake ]; - - cmakeFlags = "-DIWYU_LLVM_ROOT_PATH=${llvmPackages.clang-unwrapped}"; - - enableParallelBuilding = true; } |