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

treewide: fix config.allowAliases = false evaluation

Browse Source
This commit is contained in:
Ryan Mulligan 2018-09-12 22:22:39 -07:00
parent 0f2b10d1ac
commit f91a79ecc8
7 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/krita/default.nix
View File

@ -3,7 +3,7 @@
, kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
, kio, kcrash , kio, kcrash
, boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib
, openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase , openjpeg, opencolorio, vc, poppler, curl, ilmbase
, qtmultimedia, qtx11extras , qtmultimedia, qtx11extras
, python3 , python3
}: }:
@ -23,7 +23,7 @@ mkDerivation rec {
karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
ki18n kitemmodels kitemviews kwindowsystem kio kcrash ki18n kitemmodels kitemviews kwindowsystem kio kcrash
boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib
openjpeg opencolorio poppler_qt5 curl ilmbase openjpeg opencolorio poppler curl ilmbase
qtmultimedia qtx11extras qtmultimedia qtx11extras
python3 python3
] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc;

4
pkgs/applications/graphics/qcomicbook/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler_qt5 }: { stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qcomicbook-${version}"; name = "qcomicbook-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
qtbase qttools qtx11extras poppler_qt5 qtbase qttools qtx11extras poppler
]; ];
postInstall = '' postInstall = ''

4
pkgs/applications/window-managers/xmonad/log-applet/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib
, desktopSupport, xlibs , desktopSupport, xorg
, gtk2 , gtk2
, gtk3, gnome3, mate , gtk3, gnome3, mate
, libxfce4util, xfce4-panel , libxfce4util, xfce4-panel
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "042307grf4zvn61gnflhsj5xsjykrk9sjjsprprm4iij0qpybxcw"; sha256 = "042307grf4zvn61gnflhsj5xsjykrk9sjjsprprm4iij0qpybxcw";
}; };
buildInputs = [ glib dbus-glib xlibs.xcbutilwm ] buildInputs = [ glib dbus-glib xorg.xcbutilwm ]
++ stdenv.lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] ++ stdenv.lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ]
++ stdenv.lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] ++ stdenv.lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ]
++ stdenv.lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ++ stdenv.lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]

4
pkgs/misc/drivers/sc-controller/default.nix
View File

@ -2,7 +2,7 @@
, gtk3, gobjectIntrospection, libappindicator-gtk3, librsvg , gtk3, gobjectIntrospection, libappindicator-gtk3, librsvg
, evdev, pygobject3, pylibacl, pytest, bluez , evdev, pygobject3, pylibacl, pytest, bluez
, linuxHeaders , linuxHeaders
, libX11, libXext, libXfixes, libusb1, libudev , libX11, libXext, libXfixes, libusb1, udev
}: }:
buildPythonApplication rec { buildPythonApplication rec {
@ -34,7 +34,7 @@ buildPythonApplication rec {
substituteInPlace scc/device_monitor.py --replace "find_library('bluetooth')" "'libbluetooth.so.3'" substituteInPlace scc/device_monitor.py --replace "find_library('bluetooth')" "'libbluetooth.so.3'"
''; '';
LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 libudev bluez ]; LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes libusb1 udev bluez ];
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH") gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH")

6
pkgs/misc/vim-plugins/default.nix
View File

@ -111,7 +111,7 @@ self = generated // (with generated; {
''; '';
}); });
command_T = command_T.overrideAttrs(old: { command-t = command-t.overrideAttrs(old: {
buildInputs = [ ruby rake ]; buildInputs = [ ruby rake ];
buildPhase = '' buildPhase = ''
rake make rake make
@ -166,7 +166,7 @@ self = generated // (with generated; {
dependencies = ["gitv"]; dependencies = ["gitv"];
}); });
taglist = taglist.overrideAttrs(old: { taglist-vim = taglist-vim.overrideAttrs(old: {
setSourceRoot = '' setSourceRoot = ''
export sourceRoot=taglist export sourceRoot=taglist
mkdir taglist mkdir taglist
@ -309,7 +309,7 @@ self = generated // (with generated; {
''; '';
}); });
yankring = yankring.overrideAttrs(old: { YankRing-vim = YankRing-vim.overrideAttrs(old: {
sourceRoot = "."; sourceRoot = ".";
}); });

4
pkgs/tools/X11/ncview/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl { stdenv, fetchurl
, netcdf, x11, xorg, udunits, expat , netcdf, xlibsWrapper, xorg, udunits, expat
}: }:
let let
@ -14,7 +14,7 @@ in stdenv.mkDerivation {
sha256 = "1gliziyxil2fcz85hj6z0jq33avrxdcjs74d500lhxwvgd8drfp8"; sha256 = "1gliziyxil2fcz85hj6z0jq33avrxdcjs74d500lhxwvgd8drfp8";
}; };
buildInputs = [ netcdf x11 xorg.libXaw udunits expat ]; buildInputs = [ netcdf xlibsWrapper xorg.libXaw udunits expat ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Visual browser for netCDF format files"; description = "Visual browser for netCDF format files";

1
pkgs/top-level/all-packages.nix
View File

@ -17241,7 +17241,6 @@ with pkgs;
krita = libsForQt5.callPackage ../applications/graphics/krita { krita = libsForQt5.callPackage ../applications/graphics/krita {
openjpeg = openjpeg_1; openjpeg = openjpeg_1;
poppler_qt5 = libsForQt5.poppler;
}; };
krusader = libsForQt5.callPackage ../applications/misc/krusader { }; krusader = libsForQt5.callPackage ../applications/misc/krusader { };