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

treewide: preserve hashes from 76999cc40e

Browse Source 
76999cc40e 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.
This commit is contained in:
Matthew Bauer 2018-07-19 00:09:01 -04:00
parent aab3182ca4
commit 4ed7a4b993
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/window-managers/afterstep/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus ];
buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ];
# A strange type of bug: dbus is not immediately found by pkgconfig
preConfigure = ''

2
pkgs/desktops/enlightenment/efl.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr
xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit
harfbuzz jbig2dec librsvg alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
harfbuzz jbig2dec librsvg dbus alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm
libinput utillinux fribidi SDL2 ];
# ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++

2
pkgs/development/libraries/libvirt/default.nix
View File

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

2
pkgs/development/libraries/strigi/default.nix
View File

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

2
pkgs/development/python-modules/dbus/default.nix
View File

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

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

@ -12428,7 +12428,7 @@ let self = _self // overrides; _self = with self; {
url = "https://alioth.debian.org/frs/download.php/file/4142/po4a-0.47.tar.gz";
sha256 = "5010e1b7df1115cbd475f46587fc05fefc97301f9bba0c2f15106005ca017507";
};
nativeBuildInputs = [ pkgs.docbook_xsl pkgs.docbook_xsl_ns ];
nativeBuildInputs = [ pkgs.docbook_xsl pkgs.docbook_xsl pkgs.docbook_xsl_ns ];
propagatedBuildInputs = [ TextWrapI18N LocaleGettext TermReadKey SGMLSpm ModuleBuild UnicodeLineBreak ModuleBuild ];
buildInputs = [ pkgs.gettext pkgs.libxslt pkgs.glibcLocales pkgs.docbook_xml_dtd_412 pkgs.docbook_sgml_dtd_41 pkgs.texlive.combined.scheme-basic pkgs.jade ];
LC_ALL="en_US.UTF-8";