ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 14:19:58 +03:00
Code Issues Projects Releases Wiki Activity

smpeg: fix build with gcc8

Browse Source
This commit is contained in:
Franz Pletz 2019-01-17 09:26:35 +01:00
parent 87701cfbbe
commit 9b99fa86c1
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/smpeg/default.nix
View File

@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
patches = [
./format.patch
./gcc6.patch
./libx11.patch
];
enableParallelBuilding = true;

25
pkgs/development/libraries/smpeg/libx11.patch Normal file
View File

@ -0,0 +1,25 @@
Index: smpeg-0.4.5+cvs20030824/Makefile.am
===================================================================
--- smpeg-0.4.5+cvs20030824.orig/Makefile.am
+++ smpeg-0.4.5+cvs20030824/Makefile.am
@@ -74,7 +74,7 @@
# Sources for gtv
gtv_SOURCES = gtv.c gtv.h
-gtv_LDADD = @GTK_LIBS@ libsmpeg.la
+gtv_LDADD = @GTK_LIBS@ @X11_LIBS@ libsmpeg.la
# Sources for glmovie
glmovie_SOURCES = glmovie-tile.c glmovie.c glmovie.h
Index: smpeg-0.4.5+cvs20030824/configure.in
===================================================================
--- smpeg-0.4.5+cvs20030824.orig/configure.in
+++ smpeg-0.4.5+cvs20030824/configure.in
@@ -215,6 +215,7 @@
CFLAGS="$CFLAGS $GTK_CFLAGS"
fi
AC_SUBST(GTK_LIBS)
+ PKG_CHECK_MODULES([X11], [x11])
fi
AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xyes)