From 99f5cab192dfa206aa1d8b489d17d1be2c24bbff Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 1 Jan 2022 21:13:44 -0300 Subject: [PATCH] libcaca: 0.99.beta19 -> 0.99.beta20 --- .../development/libraries/libcaca/default.nix | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index f12409f271f..b0d09a5f749 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,40 +1,32 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub +, autoreconfHook , imlib2 , libX11 , libXext , ncurses , pkg-config -, x11Support ? !stdenv.isDarwin , zlib +, x11Support ? !stdenv.isDarwin }: stdenv.mkDerivation rec { pname = "libcaca"; - version = "0.99.beta19"; + version = "0.99.beta20"; - src = fetchurl { - urls = [ - "http://fossies.org/linux/privat/${pname}-${version}.tar.gz" - "http://caca.zoy.org/files/libcaca/${pname}-${version}.tar.gz" - ]; - hash = "sha256-EotGfE7QMmTBh0BRcqToMEk0LMjML2VfU6LQ7p03cvQ="; + src = fetchFromGitHub { + owner = "cacalabs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-N0Lfi0d4kjxirEbIjdeearYWvStkKMyV6lgeyNKXcVw="; }; - outputs = [ "bin" "dev" "out" "man" ]; - - configureFlags = [ - (if x11Support then "--enable-x11" else "--disable-x11") - ]; - - NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; - - enableParallelBuilding = true; - nativeBuildInputs = [ + autoreconfHook pkg-config ]; + buildInputs = [ ncurses zlib @@ -44,6 +36,14 @@ stdenv.mkDerivation rec { libXext ]; + outputs = [ "bin" "dev" "out" "man" ]; + + configureFlags = [ + (if x11Support then "--enable-x11" else "--disable-x11") + ]; + + NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING"; + postInstall = '' mkdir -p $dev/bin mv $bin/bin/caca-config $dev/bin/caca-config