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

treewide: *Inputs are flat lists

Browse Source
This commit is contained in:
Maximilian Bosch 2019-11-10 01:12:23 +01:00 committed by Jan Tojnar
parent 760e23136a
commit 839c0ea7a5
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/ranger/default.nix
View File

@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
checkInputs = with python3Packages; [ pytest ]; checkInputs = with python3Packages; [ pytest ];
propagatedBuildInputs = [ file ] propagatedBuildInputs = [ file ]
++ lib.optional (imagePreviewSupport) [ python3Packages.pillow ]; ++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ];
checkPhase = '' checkPhase = ''
py.test tests py.test tests

4
pkgs/applications/video/kodi/default.nix
View File

@ -179,7 +179,7 @@ in stdenv.mkDerivation {
++ lib.optional udevSupport udev ++ lib.optional udevSupport udev
++ lib.optional usbSupport libusb ++ lib.optional usbSupport libusb
++ lib.optional vdpauSupport libvdpau ++ lib.optional vdpauSupport libvdpau
++ lib.optional useWayland [ ++ lib.optionals useWayland [
wayland waylandpp wayland waylandpp
# Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise
libxkbcommon.dev libxkbcommon.dev
@ -192,7 +192,7 @@ in stdenv.mkDerivation {
which which
pkgconfig gnumake pkgconfig gnumake
autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 autoconf automake libtool # still needed for some components. Check if that is the case with 19.0
] ++ lib.optional useWayland [ wayland-protocols ]; ] ++ lib.optionals useWayland [ wayland-protocols ];
cmakeFlags = [ cmakeFlags = [
"-Dlibdvdcss_URL=${libdvdcss.src}" "-Dlibdvdcss_URL=${libdvdcss.src}"

6
pkgs/development/libraries/qtkeychain/default.nix
View File

@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]; cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
nativeBuildInputs = [ cmake ] nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret
; ;
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) [ libsecret ] buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libsecret ]
++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]) ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ])
++ stdenv.lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreFoundation Security CoreFoundation Security
]) ])
; ;

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

@ -27,7 +27,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ adal msrest ]; propagatedBuildInputs = [ adal msrest ];
checkInputs = [ httpretty mock pytest ] checkInputs = [ httpretty mock pytest ]
++ lib.optional isPy3k [ pytest-asyncio ]; ++ lib.optionals isPy3k [ pytest-asyncio ];
checkPhase = '' checkPhase = ''
pytest tests/ pytest tests/

2
pkgs/tools/admin/salt/default.nix
View File

@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec {
pyzmq pyzmq
requests requests
tornado_4 tornado_4
] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [ ] ++ stdenv.lib.optionals (!pythonPackages.isPy3k) [
futures futures
] ++ extraInputs; ] ++ extraInputs;