diff options
| -rw-r--r-- | pkgs/desktops/plasma-5.2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libdbi-drivers/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/pdf2svg/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/system/rsyslog/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix index 8a7733299b5d..7a7a48a4d82d 100644 --- a/pkgs/desktops/plasma-5.2/default.nix +++ b/pkgs/desktops/plasma-5.2/default.nix @@ -38,7 +38,7 @@ let { LibBlueDevil = pkgs.libbluedevil; PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; }; - PopplerQt5 = pkgs.poppler_qt.override { inherit qt5; }; + PopplerQt5 = pkgs.poppler_qt5.override { inherit qt5; }; } // # packages from nixpkgs (with pkgs; diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 128553705e0b..4e122028ec00 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; }; - buildInputs = [ libdbi mysql.lib sqlite postgresql ]; + buildInputs = [ libdbi sqlite postgresql ] ++ optional (mysql != null) mysql; postPatch = '' sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index 591a85c24472..826f1a56055e 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1jy6iqwwvd7drcybmdlmnc8m970f82fd7fisa8ha5zh13p49r8n2"; }; - buildInputs = [ cairo pkgconfig poppler.poppler_glib gtk ]; + buildInputs = [ cairo pkgconfig poppler gtk ]; meta = { description = "PDF converter to SVG format"; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index a9fabd19f478..9966141bdfd1 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libestr json_c zlib pythonPackages.docutils - krb5 jemalloc mysql.lib postgresql libdbi net_snmp libuuid curl gnutls + krb5 jemalloc postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka libmongo-client czmq rabbitmq-c hiredis - ] ++ stdenv.lib.optional stdenv.isLinux systemd; + ] ++ stdenv.lib.optional stdenv.isLinux systemd ++ stdenv.lib.optional (mysql != null) mysql.lib; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0d724e21080a..b2cebf63fff0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2037,7 +2037,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pop3client = callPackage ../development/libraries/haskell/pop3-client {}; poppler = callPackage ../development/libraries/haskell/poppler { - popplerGlib = pkgs.poppler.poppler_glib; + popplerGlib = pkgs.poppler; libc = pkgs.stdenv.cc.libc; }; |