diff options
| author | Nick Cao <nickcao@nichi.co> | 2021-12-16 15:53:01 +0800 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2022-06-11 22:11:04 +0800 |
| commit | 0f9a77f5cbcfcd59144f33ace06f1670bfc259e9 (patch) | |
| tree | 5fc9ea48ed36d3c16a13be442a5346504d4056ac /pkgs/development/libraries/smpeg | |
| parent | d141ee34ac87ee06b8090ab60b3e4c2b5a0ead02 (diff) | |
smpeg: fix handling of pkg-config
Diffstat (limited to 'pkgs/development/libraries/smpeg')
| -rw-r--r-- | pkgs/development/libraries/smpeg/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/smpeg/gtk.patch | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 03af2e40fa3a1..8e50945ee9962 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { ./format.patch ./gcc6.patch ./libx11.patch + ./gtk.patch ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/smpeg/gtk.patch b/pkgs/development/libraries/smpeg/gtk.patch new file mode 100644 index 0000000000000..8f9f2f492ed15 --- /dev/null +++ b/pkgs/development/libraries/smpeg/gtk.patch @@ -0,0 +1,15 @@ +diff '--color=auto' -Naur smpeg-r390.orig/acinclude/gtk-2.0.m4 smpeg-r390/acinclude/gtk-2.0.m4 +--- smpeg-r390.orig/acinclude/gtk-2.0.m4 1970-01-01 08:00:01.000000000 +0800 ++++ smpeg-r390/acinclude/gtk-2.0.m4 2021-12-16 15:52:17.776001058 +0800 +@@ -24,10 +24,8 @@ + + no_gtk="" + +- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +- + if test x$PKG_CONFIG != xno ; then +- if pkg-config --atleast-pkgconfig-version 0.7 ; then ++ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then + : + else + echo "*** pkg-config too old; version 0.7 or better required." |