From 8313dacb11a9f835fbfa8a9d785ad1e31171eae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 18 Nov 2020 09:42:33 +0100 Subject: [PATCH] treewide: remove trailing whitespace --- pkgs/applications/networking/p2p/soulseekqt/default.nix | 2 +- pkgs/applications/networking/ps2client/default.nix | 2 +- pkgs/games/assaultcube/default.nix | 2 +- pkgs/misc/emulators/qmc2/default.nix | 2 +- pkgs/tools/filesystems/cpcfs/default.nix | 2 +- pkgs/tools/networking/photon/default.nix | 2 +- pkgs/tools/text/poedit/default.nix | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index c9c2d5bfef99..0d2fc0fd833c 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { dontBuild = true; dontConfigure = true; - + nativeBuildInputs = [ imagemagick autoPatchelfHook desktop-file-utils ]; buildInputs = [ qtmultimedia stdenv.cc.cc ]; diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix index e0891f621495..444a6dcf45c7 100644 --- a/pkgs/applications/networking/ps2client/default.nix +++ b/pkgs/applications/networking/ps2client/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { patchPhase = '' sed -i -e "s|-I/usr/include||g" -e "s|-I/usr/local/include||g" Makefile ''; - + installPhase = '' make PREFIX=$out install ''; diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index 8fa5b64095ad..423130a53561 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { cp ${desktop}/share/applications/* $out/share/applications install -Dpm644 packages/misc/icon.png $out/share/icons/assaultcube.png install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png - + makeWrapper $out/bin/ac_client $out/bin/${pname} \ --run "cd $out/$gamedatadir" --add-flags "--home=\$HOME/.assaultcube/v1.2next --init" fi diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix index 0ed03f810542..d089ddf2695b 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/misc/emulators/qmc2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${pname}-${version}.tar.gz"; sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns"; }; - + preBuild = '' patchShebangs scripts ''; diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix index 222b9cf68bf0..1c639dfc29ec 100644 --- a/pkgs/tools/filesystems/cpcfs/default.nix +++ b/pkgs/tools/filesystems/cpcfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "cpcfs"; version = "0.85.4"; - + src = fetchFromGitHub { owner = "derikz"; repo = "cpcfs"; diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index edaaa4b17142..db6917ef0b76 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { installPhase = '' mkdir -p "$out"/{bin,share/photon} cp -R photon.py core plugins $out/share/photon - + makeWrapper ${python3Packages.python.interpreter} $out/bin/photon \ --set PYTHONPATH "$PYTHONPATH:$out/share/photon" \ --add-flags "-O $out/share/photon/photon.py" diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index cc1cedffb0e0..9ece11c74260 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0pvd903j2x3h9wh38fhlcn23d0jkjlqnfbdpbvnbhy6al1ngx72w"; }; - nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook + nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook libxslt xmlto boost libtool pkgconfig ]; buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ]; propagatedBuildInputs = [ gettext ]; - + preConfigure = " patchShebangs bootstrap ./bootstrap @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { "--with-boost-libdir=${boost.out}/lib" "CPPFLAGS=-I${nlohmann_json}/include/nlohmann/" ]; - + preFixup = '' gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ gettext ]}") ''; - + enableParallelBuilding = true; meta = with stdenv.lib; {