diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-20 19:56:04 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-28 14:40:49 +0000 |
| commit | 36bedbe5c162bab9e7ef702f353ae399fdfd0518 (patch) | |
| tree | fb2926eee09fe0714683074758276739e9e5cda9 /nixpkgs/pkgs/development/libraries/smpeg | |
| parent | 47852a9ef0e62a2d565f9ec0fba2a3ae77c44221 (diff) | |
| parent | 262b328b0bad0c4b97ed495679208e4a2eb87704 (diff) | |
| download | nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.gz nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.bz2 nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.lz nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.xz nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.tar.zst nixlib-36bedbe5c162bab9e7ef702f353ae399fdfd0518.zip | |
Merge commit '262b328b0bad0c4b97ed495679208e4a2eb87704'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/smpeg')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/smpeg/default.nix | 1 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/smpeg/libx11.patch | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/smpeg/default.nix b/nixpkgs/pkgs/development/libraries/smpeg/default.nix index 35d5075a949a..e28667883020 100644 --- a/nixpkgs/pkgs/development/libraries/smpeg/default.nix +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/smpeg/libx11.patch b/nixpkgs/pkgs/development/libraries/smpeg/libx11.patch new file mode 100644 index 000000000000..8611073780f3 --- /dev/null +++ b/nixpkgs/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) + |