diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-10-04 10:09:31 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-10-04 21:49:33 -0500 |
| commit | fc23f64d34be7eaba79a5e36194b2f5cdc45fbf9 (patch) | |
| tree | e44358c3e27323c2ae141e1a7d46367c10cf69bb /pkgs/development/libraries | |
| parent | ebe90e3e2dc07fe0675593efe558e96b2b55ceb3 (diff) | |
| download | nixlib-fc23f64d34be7eaba79a5e36194b2f5cdc45fbf9.tar nixlib-fc23f64d34be7eaba79a5e36194b2f5cdc45fbf9.tar.gz nixlib-fc23f64d34be7eaba79a5e36194b2f5cdc45fbf9.tar.bz2 nixlib-fc23f64d34be7eaba79a5e36194b2f5cdc45fbf9.tar.lz nixlib-fc23f64d34be7eaba79a5e36194b2f5cdc45fbf9.tar.xz nixlib-fc23f64d34be7eaba79a5e36194b2f5cdc45fbf9.tar.zst nixlib-fc23f64d34be7eaba79a5e36194b2f5cdc45fbf9.zip | |
qt5.qtbase: ruby is no longer a dependency
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.6/qtbase/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.7/qtbase/default.nix | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index d36a7ef82734..138faf86506f 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -7,7 +7,7 @@ , openssl, dbus, glib, udev, libxml2, libxslt, pcre16 , zlib, libjpeg, libpng, libtiff, sqlite, icu -, coreutils, bison, flex, gdb, gperf, lndir, ruby +, coreutils, bison, flex, gdb, gperf, lndir , patchelf, perl, pkgconfig, python # optional dependencies @@ -205,7 +205,7 @@ stdenv.mkDerivation { ++ lib.optional mesaSupported mesa; buildInputs = - [ bison flex gperf ruby ] + [ bison flex gperf ] ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.lib @@ -256,7 +256,7 @@ stdenv.mkDerivation { postFixup = '' - # Don't retain build-time dependencies like gdb and ruby. + # Don't retain build-time dependencies like gdb. sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri # Move libtool archives and qmake projects diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index 2f414efc3142..25e94c44ad2c 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -7,7 +7,7 @@ , openssl, dbus, glib, udev, libxml2, libxslt, pcre16 , zlib, libjpeg, libpng, libtiff, sqlite, icu -, coreutils, bison, flex, gdb, gperf, lndir, ruby +, coreutils, bison, flex, gdb, gperf, lndir , patchelf, perl, pkgconfig, python # optional dependencies @@ -180,7 +180,7 @@ stdenv.mkDerivation { ++ lib.optional mesaSupported mesa; buildInputs = - [ bison flex gperf ruby ] + [ bison flex gperf ] ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.lib @@ -213,7 +213,7 @@ stdenv.mkDerivation { postFixup = '' - # Don't retain build-time dependencies like gdb and ruby. + # Don't retain build-time dependencies like gdb. sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri # Move libtool archives and qmake projects diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix index a31452e6d9bb..81d0e446f2a8 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -189,7 +189,7 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir patchelf perl pkgconfig python ruby ]; + [ bison flex gperf lndir patchelf perl pkgconfig python ]; # freetype-2.5.4 changed signedness of some struct fields NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; @@ -216,7 +216,7 @@ stdenv.mkDerivation { postFixup = '' - # Don't retain build-time dependencies like gdb and ruby. + # Don't retain build-time dependencies like gdb. sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri # Move libtool archives and qmake projects |