Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ffc14a60b510
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b0f4ef91273a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 24, 2019

  1. libcaca: make x11 optional, disabled on darwin

    @jacereda
    jacereda committed Mar 24, 2019
    Copy the full SHA
    3152d49 View commit details

Commits on Mar 26, 2019

  1. Merge pull request #57687 from jacereda/libcaca-nox 

    libcaca: make x11 optional, disabled on darwin
    @LnL7
    LnL7 authored Mar 26, 2019
    Copy the full SHA
    b0f4ef9 View commit details
Showing with 13 additions and 3 deletions.
  1. +13 −3 pkgs/development/libraries/libcaca/default.nix
16 changes: 13 additions & 3 deletions pkgs/development/libraries/libcaca/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11, libXext }:
{ stdenv, fetchurl, ncurses, zlib, pkgconfig, imlib2
, x11Support ? !stdenv.isDarwin, libX11, libXext
}:

stdenv.mkDerivation rec {
name = "libcaca-0.99.beta19";
@@ -13,8 +15,16 @@ stdenv.mkDerivation rec {

outputs = [ "bin" "dev" "out" "man" ];

propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ]
++ stdenv.lib.optional stdenv.isDarwin libXext;
configureFlags = [
(if x11Support then "--enable-x11" else "--disable-x11")
];

NIX_CFLAGS_COMPILE = stdenv.lib.optional (!x11Support) "-DX_DISPLAY_MISSING";

enableParallelBuilding = true;

propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ]
++ stdenv.lib.optionals x11Support [ libX11 libXext];

postInstall = ''
mkdir -p $dev/bin