public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt5.qtbase: ruby is no longer a dependency

Browse Source
This commit is contained in:
Thomas Tuegel
2016-10-04 21:49:33 -05:00
parent ebe90e3e2d
commit fc23f64d34
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+3 -3
View File
@@ -7,7 +7,7 @@
, openssl, dbus, glib, udev, libxml2, libxslt, pcre16 , openssl, dbus, glib, udev, libxml2, libxslt, pcre16
, zlib, libjpeg, libpng, libtiff, sqlite, icu , zlib, libjpeg, libpng, libtiff, sqlite, icu
, coreutils, bison, flex, gdb, gperf, lndir, ruby , coreutils, bison, flex, gdb, gperf, lndir
, patchelf, perl, pkgconfig, python , patchelf, perl, pkgconfig, python
# optional dependencies # optional dependencies
@@ -205,7 +205,7 @@ stdenv.mkDerivation {
++ lib.optional mesaSupported mesa; ++ lib.optional mesaSupported mesa;
buildInputs = buildInputs =
[ bison flex gperf ruby ] [ bison flex gperf ]
++ lib.optional developerBuild gdb ++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups ++ lib.optional (cups != null) cups
++ lib.optional (mysql != null) mysql.lib ++ lib.optional (mysql != null) mysql.lib
@@ -256,7 +256,7 @@ stdenv.mkDerivation {
postFixup = 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 sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
# Move libtool archives and qmake projects # Move libtool archives and qmake projects
pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+3 -3
View File
@@ -7,7 +7,7 @@
, openssl, dbus, glib, udev, libxml2, libxslt, pcre16 , openssl, dbus, glib, udev, libxml2, libxslt, pcre16
, zlib, libjpeg, libpng, libtiff, sqlite, icu , zlib, libjpeg, libpng, libtiff, sqlite, icu
, coreutils, bison, flex, gdb, gperf, lndir, ruby , coreutils, bison, flex, gdb, gperf, lndir
, patchelf, perl, pkgconfig, python , patchelf, perl, pkgconfig, python
# optional dependencies # optional dependencies
@@ -180,7 +180,7 @@ stdenv.mkDerivation {
++ lib.optional mesaSupported mesa; ++ lib.optional mesaSupported mesa;
buildInputs = buildInputs =
[ bison flex gperf ruby ] [ bison flex gperf ]
++ lib.optional developerBuild gdb ++ lib.optional developerBuild gdb
++ lib.optional (cups != null) cups ++ lib.optional (cups != null) cups
++ lib.optional (mysql != null) mysql.lib ++ lib.optional (mysql != null) mysql.lib
@@ -213,7 +213,7 @@ stdenv.mkDerivation {
postFixup = 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 sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
# Move libtool archives and qmake projects # Move libtool archives and qmake projects
pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+2 -2
View File
@@ -189,7 +189,7 @@ stdenv.mkDerivation {
++ lib.optional (postgresql != null) postgresql; ++ lib.optional (postgresql != null) postgresql;
nativeBuildInputs = 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 # freetype-2.5.4 changed signedness of some struct fields
NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
@@ -216,7 +216,7 @@ stdenv.mkDerivation {
postFixup = 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 sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
# Move libtool archives and qmake projects # Move libtool archives and qmake projects