diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-05-19 05:12:55 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-05-19 07:52:19 -0400 |
| commit | bfaeb1bdd7d496f3b01113c7325e23c11e2b4a80 (patch) | |
| tree | 61bf8bf7e537959514e9a844e422b56a078cb8d0 | |
| parent | 0b6dcc02cd23953586c6ada1d9a5e14a2f6c0c0a (diff) | |
| download | nixpkgs-bfaeb1bdd7d496f3b01113c7325e23c11e2b4a80.tar nixpkgs-bfaeb1bdd7d496f3b01113c7325e23c11e2b4a80.tar.gz nixpkgs-bfaeb1bdd7d496f3b01113c7325e23c11e2b4a80.tar.bz2 nixpkgs-bfaeb1bdd7d496f3b01113c7325e23c11e2b4a80.tar.lz nixpkgs-bfaeb1bdd7d496f3b01113c7325e23c11e2b4a80.tar.xz nixpkgs-bfaeb1bdd7d496f3b01113c7325e23c11e2b4a80.tar.zst nixpkgs-bfaeb1bdd7d496f3b01113c7325e23c11e2b4a80.zip | |
libAfterImage: compile against libX11
This is needed to not have X_DISPLAY_MISSING for asimage2pixmap function to be implemented: https://root-forum.cern.ch/t/root-xpm-error-on-ubuntu-revisited/4552/10
| -rw-r--r-- | pkgs/development/libraries/libAfterImage/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index 1f833321d90..de463cdf42c 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, giflib, libjpeg, libpng, zlib -, static ? stdenv.hostPlatform.isStatic }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, giflib, libjpeg, libpng, libX11, zlib +, static ? stdenv.hostPlatform.isStatic +, withX ? !stdenv.isDarwin }: stdenv.mkDerivation { pname = "libAfterImage"; @@ -47,7 +48,7 @@ stdenv.mkDerivation { patchFlags = [ "-p0" ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ giflib libjpeg libpng zlib ]; + buildInputs = [ giflib libjpeg libpng zlib ] ++ lib.optional withX libX11; preConfigure = '' rm -rf {libjpeg,libpng,libungif,zlib}/ @@ -63,7 +64,7 @@ stdenv.mkDerivation { "--disable-mmx-optimization" "--${if static then "enable" else "disable"}-staticlibs" "--${if !static then "enable" else "disable"}-sharedlibs" - ]; + ] ++ lib.optional withX "--with-x"; meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; |