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

fix eval

Browse Source
This commit is contained in:
Domen Kožar 2015-04-02 22:30:28 +02:00
parent b07f749f37
commit 7cc31b6b49
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/plasma-5.2/default.nix
View File

@ -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;

2
pkgs/development/libraries/libdbi-drivers/default.nix
View File

@ -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;

2
pkgs/tools/graphics/pdf2svg/default.nix
View File

@ -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";

4
pkgs/tools/system/rsyslog/default.nix
View File

@ -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"

2
pkgs/top-level/haskell-packages.nix
View File

@ -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;
};