diff options
| author | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-19 00:09:01 -0400 |
|---|---|---|
| committer | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-19 00:09:01 -0400 |
| commit | 4ed7a4b993d3e03e16eb5dbe0f1ea3061d2eb475 (patch) | |
| tree | 997c964a3565338a289be433357a7302d12d33a8 /pkgs/development | |
| parent | aab3182ca4a2b69bfd01db53e1e95c941425203b (diff) | |
treewide: preserve hashes from 76999cc40e6
76999cc40e6 changed some hashes resulting in this PR being technically
a mass rebuild. To avoid this, I am restoring some of the hashes (even
though it seems silly). My main goal is to get this PR merged quickly
as treewide changes like this get out-of-date quickly.
This commit should be reverted on the next mass rebuild.
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/libvirt/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/strigi/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/dbus/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 57eb5b42f37a..02c13e413e33 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ - libpciaccess lvm2 utillinux systemd libnl numad zfs + libpciaccess lvm2 lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index e2b8279b3caf..36768acd991a 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { CLUCENE_HOME = clucene_core; buildInputs = - [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus ]; + [ zlib bzip2 libxml2 qt4 exiv2 clucene_core fam dbus.out ]; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix index 5e42331d1838..8f3f331fd509 100644 --- a/pkgs/development/python-modules/dbus/default.nix +++ b/pkgs/development/python-modules/dbus/default.nix @@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dbus dbus-glib ] - ++ lib.optionals doCheck [ pygobject3 ] + ++ lib.optionals doCheck [ dbus.out pygobject3 ] # My guess why it's sometimes trying to -lncurses. # It seems not to retain the dependency anyway. ++ lib.optional (! python ? modules) ncurses; |