treewide: fix some Function called without required argument

by removing packages(if the dependency has been removed) or fixing the argument
This commit is contained in:
Artturin 2022-11-17 14:36:43 +02:00
parent 07f075b57e
commit e1b1e5a0c0
6 changed files with 6 additions and 118 deletions

View File

@ -13,7 +13,7 @@
, libXrandr
, libXi
, gnome
, kdialog
, libsForQt5
}:
rustPlatform.buildRustPackage rec {
@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec {
in
''
patchelf --set-rpath "${libPath}" "$out/bin/$pname"
wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity kdialog ]}
wrapProgram $out/bin/$pname --prefix PATH : ${lib.makeBinPath [ gnome.zenity libsForQt5.kdialog ]}
'';

View File

@ -2,7 +2,7 @@
, pkg-config, autoreconfHook
, db5, openssl, boost, zlib, miniupnpc, libevent
, protobuf, qtbase ? null
, wrapQtAppsHook ? null, qttools, qmake ? null, qrencode
, wrapQtAppsHook ? null, qttools ? null, qmake ? null, qrencode
, withGui, withUpnp ? true, withUtils ? true, withWallet ? true
, withZmq ? true, zeromq, util-linux ? null, Cocoa ? null }:

View File

@ -1,29 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, fltk, openexr, libGLU, libGL, ctl }:
stdenv.mkDerivation rec {
pname = "openexr_viewers";
version = "2.2.1";
src = fetchurl {
url = "mirror://savannah/openexr/openexr_viewers-${version}.tar.gz";
sha256 = "1ixx2wbjp4rvsf7h3bkja010gl1ihjrcjzy7h20jnn47ikg12vj8";
};
configurePhase = ''
./configure --prefix=$out --with-fltk-config=${fltk}/bin/fltk-config
'';
buildPhase = ''
make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl"
'';
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openexr fltk libGLU libGL ctl ];
meta = {
description = "Application for viewing OpenEXR images on a display at various exposure settings";
homepage = "http://openexr.com";
platforms = lib.platforms.linux;
license = lib.licenses.bsd3;
};
}

View File

@ -1,76 +0,0 @@
{ lib, stdenv, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python2Packages }:
with lib;
stdenv.mkDerivation rec {
pname = "screencloud";
version = "1.2.0";
# API Keys. According to the author of the AUR package, these are only used
# for tracking usage.
consumerKey = "23e747012c68601f27ab69c6de129ed70552d55b6";
consumerSecret = "4701cb00c1bd357bbcae7c3d713dd216";
src = fetchFromGitHub {
owner = "olav-st";
repo = "screencloud";
rev = "v${version}";
sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ qt4 quazip qt-mobility qxt python2Packages.python python2Packages.pycrypto ];
patchPhase = ''
# Required to make the configure script work. Normally, screencloud's
# CMakeLists file sets the install prefix to /opt by force. This is stupid
# and breaks nix, so we force it to install where we want. Please don't
# write CMakeLists files like this, as things like this are why we can't
# have nice things.
substituteInPlace "CMakeLists.txt" --replace "set(CMAKE_INSTALL_PREFIX \"/opt\")" ""
'';
# We need to append /opt to our CMAKE_INSTALL_PREFIX, so we tell the Nix not
# to add the argument for us.
dontAddPrefix = true;
cmakeFlags = [
"-DQXT_QXTCORE_INCLUDE_DIR=${qxt}/include/QxtCore"
"-DQXT_QXTCORE_LIB_RELEASE=${qxt}/lib/libQxtCore.so"
"-DQXT_QXTGUI_INCLUDE_DIR=${qxt}/include/QxtGui"
"-DQXT_QXTGUI_LIB_RELEASE=${qxt}/lib/libQxtGui.so"
"-DCONSUMER_KEY_SCREENCLOUD=${consumerKey}"
"-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}"
];
setSourceRoot = ''
sourceRoot=$(echo */screencloud)
'';
preConfigure = ''
# This needs to be set in preConfigure instead of cmakeFlags in order to
# access the $prefix environment variable.
export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix/opt $cmakeFlags"
'';
# There are a number of issues with screencloud's installation. We need to add
# pycrypto to the PYTHONPATH so that the SFTP plugin will work properly; and
# we need to move the libPythonQt library into a folder where it can actually
# be found.
postInstall = ''
patchShebangs $prefix/opt/screencloud/screencloud.sh
substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt"
sed -i "2 i\export PYTHONPATH=$(toPythonPath ${python2Packages.pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh"
mkdir $prefix/bin
mkdir $prefix/lib
ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud
ln -s $prefix/opt/screencloud/libPythonQt.so $prefix/lib/libPythonQt.so
'';
meta = {
homepage = "https://screencloud.net/";
description = "Client for Screencloud, an easy to use screenshot sharing tool";
license = lib.licenses.gpl2;
maintainers = with lib.maintainers; [ forkk ];
platforms = with lib.platforms; linux;
};
}

View File

@ -2,7 +2,7 @@
, stdenvNoCC
, fetchFromGitHub
, adwaita-icon-theme
, breeze-icons
, libsForQt5
, gtk3
, hicolor-icon-theme
, jdupes
@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec {
propagatedBuildInputs = [
adwaita-icon-theme
breeze-icons
libsForQt5.breeze-icons
hicolor-icon-theme
];

View File

@ -1619,9 +1619,7 @@ with pkgs;
libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { };
ludusavi = callPackage ../applications/backup/ludusavi {
inherit (plasma5Packages) kdialog;
};
ludusavi = callPackage ../applications/backup/ludusavi { };
maiko = callPackage ../applications/emulators/maiko { };
@ -11255,8 +11253,6 @@ with pkgs;
screen-message = callPackage ../tools/X11/screen-message { };
screencloud = libsForQt5.callPackage ../applications/graphics/screencloud { };
screenkey = callPackage ../applications/video/screenkey { };
scrub = callPackage ../tools/misc/scrub { };
@ -27034,7 +27030,6 @@ with pkgs;
tela-circle-icon-theme = callPackage ../data/icons/tela-circle-icon-theme {
inherit (gnome) adwaita-icon-theme;
inherit (plasma5Packages) breeze-icons;
};
tela-icon-theme = callPackage ../data/icons/tela-icon-theme { };
@ -28350,8 +28345,6 @@ with pkgs;
kvmtool = callPackage ../applications/virtualization/kvmtool { };
exrdisplay = callPackage ../applications/graphics/exrdisplay { };
exrtools = callPackage ../applications/graphics/exrtools { };
f1viewer = callPackage ../applications/video/f1viewer {};