diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-01-17 09:26:35 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-06-17 07:25:59 +0200 |
| commit | 9b99fa86c1631081764375712b33fadfc100457e (patch) | |
| tree | efb4390020f534f1a59ee82062505e1e26af16b1 /pkgs/development | |
| parent | 87701cfbbe0093acbdf20496e72baa6a46048c2c (diff) | |
| download | nixlib-9b99fa86c1631081764375712b33fadfc100457e.tar nixlib-9b99fa86c1631081764375712b33fadfc100457e.tar.gz nixlib-9b99fa86c1631081764375712b33fadfc100457e.tar.bz2 nixlib-9b99fa86c1631081764375712b33fadfc100457e.tar.lz nixlib-9b99fa86c1631081764375712b33fadfc100457e.tar.xz nixlib-9b99fa86c1631081764375712b33fadfc100457e.tar.zst nixlib-9b99fa86c1631081764375712b33fadfc100457e.zip | |
smpeg: fix build with gcc8
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/smpeg/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/smpeg/libx11.patch | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 35d5075a949a..e28667883020 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./format.patch ./gcc6.patch + ./libx11.patch ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/smpeg/libx11.patch b/pkgs/development/libraries/smpeg/libx11.patch new file mode 100644 index 000000000000..8611073780f3 --- /dev/null +++ b/pkgs/development/libraries/smpeg/libx11.patch @@ -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) + |