diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 03:59:58 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-31 03:59:58 +0100 |
| commit | 0c2adc0fb1b0b551bef119477f37b86190cd9cc5 (patch) | |
| tree | f0fe93cd1157d2f0ef8f2cb052c48124f866386b /pkgs/development/libraries/libcaca/default.nix | |
| parent | d6136b744a75e641d58d56115b1972b7dd1f4884 (diff) | |
| parent | c5406e30b02df521e75c4f5b7de62be322b05810 (diff) | |
| download | nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.gz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.bz2 nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.lz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.xz nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.tar.zst nixlib-0c2adc0fb1b0b551bef119477f37b86190cd9cc5.zip | |
Merge branch 'staging' into staging-next
Diffstat (limited to 'pkgs/development/libraries/libcaca/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libcaca/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 8949ea8e390e..7773fe46c0ce 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { (if x11Support then "--enable-x11" else "--disable-x11") ]; - NIX_CFLAGS_COMPILE = stdenv.lib.optional (!x11Support) "-DX_DISPLAY_MISSING"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; enableParallelBuilding = true; propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ] - ++ stdenv.lib.optionals x11Support [ libX11 libXext]; + ++ stdenv.lib.optionals x11Support [ libX11 libXext ]; postInstall = '' mkdir -p $dev/bin |