libvisual: 0.4.1 -> 0.4.2 (#350851)
This commit is contained in:
@@ -1,51 +1,35 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, SDL
|
||||
, autoreconfHook
|
||||
, autoconf-archive
|
||||
, glib
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libvisual";
|
||||
version = "0.4.1";
|
||||
version = "0.4.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/libvisual/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-qhKHdBf3bTZC2fTHIzAjgNgzF1Y51jpVZB0Bkopd230=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Libvisual";
|
||||
repo = "libvisual";
|
||||
rev = "libvisual-${version}";
|
||||
hash = "sha256-bDnpQODXB2Z6hezVoh7c6cklp6qpyDzVBAnwZD8Gros=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libvisual";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
patches = [
|
||||
# pull upstream fix for SDL1 cross-compilation.
|
||||
# https://github.com/Libvisual/libvisual/pull/238
|
||||
(fetchpatch {
|
||||
name = "sdl-cross-prereq.patch";
|
||||
url = "https://github.com/Libvisual/libvisual/commit/7902d24aa1a552619a5738339b3823e90dd3b865.patch";
|
||||
hash = "sha256-84u8klHDAw/q4d+9L4ROAr7XsbXItHrhaEKkTEMSPcc=";
|
||||
# remove extra libvisual prefix
|
||||
stripLen = 1;
|
||||
# pull in only useful configure.ac changes.
|
||||
excludes = [ "Makefile.am" ];
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "sdl-cross-pc.patch";
|
||||
url = "https://github.com/Libvisual/libvisual/commit/f79a2e8d21ad1d7fe26e2aa83cea4c9f48f9e392.patch";
|
||||
hash = "sha256-8c7SdLxXC8K9BAwj7DzozsZAcbs5l1xuBqky9LJ1MfM=";
|
||||
# remove extra libvisual prefix
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config ];
|
||||
buildInputs = [ SDL glib ];
|
||||
|
||||
configureFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
# Remove once "sdl-cross-prereq.patch" patch above is removed.
|
||||
# Remove when 0.5.x is published.
|
||||
"--disable-lv-tool"
|
||||
] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
"ac_cv_func_malloc_0_nonnull=yes"
|
||||
|
||||
Reference in New Issue
Block a user