commit 0f9a77f5cbcfcd59144f33ace06f1670bfc259e9 · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

smpeg: fix handling of pkg-config

Nick Cao 3 years ago 0f9a77f5 d141ee34

+16

2 changed files

expand all

unified split

pkgs

development

libraries

smpeg

default.nix

gtk.patch

pkgs/development/libraries/smpeg/default.nix

··· 14 14 ./format.patch 15 15 ./gcc6.patch 16 16 ./libx11.patch 17 + ./gtk.patch 17 18 ]; 18 19 19 20 enableParallelBuilding = true;

+15

pkgs/development/libraries/smpeg/gtk.patch

··· 1 + diff '--color=auto' -Naur smpeg-r390.orig/acinclude/gtk-2.0.m4 smpeg-r390/acinclude/gtk-2.0.m4 2 + --- smpeg-r390.orig/acinclude/gtk-2.0.m4 1970-01-01 08:00:01.000000000 +0800 3 + +++ smpeg-r390/acinclude/gtk-2.0.m4 2021-12-16 15:52:17.776001058 +0800 4 + @@ -24,10 +24,8 @@ 5 + 6 + no_gtk="" 7 + 8 + - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) 9 + - 10 + if test x$PKG_CONFIG != xno ; then 11 + - if pkg-config --atleast-pkgconfig-version 0.7 ; then 12 + + if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then 13 + : 14 + else 15 + echo "*** pkg-config too old; version 0.7 or better required."