diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 21:29:47 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:50 +0200 |
| commit | 5d8fe045b6376851c33a1c772cfe46882411cd21 (patch) | |
| tree | 6f80e10e2ec11cfed92207ef87082a4ae3e1666e /pkgs/development/libraries/stxxl | |
| parent | 17b6a597fb36063e4832983d3470ce695f809b31 (diff) | |
Revert "Refactor mkFlag out of old packages"
This reverts commit 3117e0c897522ec8431572de12449f676cc8c8be. Conflicts: pkgs/development/libraries/wayland/default.nix pkgs/servers/samba/4.x.nix
Diffstat (limited to 'pkgs/development/libraries/stxxl')
| -rw-r--r-- | pkgs/development/libraries/stxxl/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 9ebd27e827717..9fb25aa36e0a6 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -2,6 +2,10 @@ , parallel ? true }: +let + mkFlag = optset: flag: if optset then "-D${flag}=ON" else "-D${flag}=OFF"; +in + stdenv.mkDerivation rec { name = "stxxl-${version}"; version = "1.4.1"; @@ -17,7 +21,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" "-DCMAKE_BUILD_TYPE=Release" - "-DUSE_GNU_PARALLEL=${if parallel then "ON" else "OFF"}" + (mkFlag parallel "USE_GNU_PARALLEL") ]; passthru = { |