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

treewide: remove trailing whitespace

Browse Source
This commit is contained in:
Jörg Thalheim 2020-11-18 09:42:33 +01:00 committed by Jonathan Ringer
parent 72f6df338d
commit 8313dacb11
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/p2p/soulseekqt/default.nix
View File

@ -23,7 +23,7 @@ mkDerivation rec {
dontBuild = true; dontBuild = true;
dontConfigure = true; dontConfigure = true;
nativeBuildInputs = [ imagemagick autoPatchelfHook desktop-file-utils ]; nativeBuildInputs = [ imagemagick autoPatchelfHook desktop-file-utils ];
buildInputs = [ qtmultimedia stdenv.cc.cc ]; buildInputs = [ qtmultimedia stdenv.cc.cc ];

2
pkgs/applications/networking/ps2client/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation {
patchPhase = '' patchPhase = ''
sed -i -e "s|-I/usr/include||g" -e "s|-I/usr/local/include||g" Makefile sed -i -e "s|-I/usr/include||g" -e "s|-I/usr/local/include||g" Makefile
''; '';
installPhase = '' installPhase = ''
make PREFIX=$out install make PREFIX=$out install
''; '';

2
pkgs/games/assaultcube/default.nix
View File

@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
cp ${desktop}/share/applications/* $out/share/applications 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/icons/assaultcube.png
install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png install -Dpm644 packages/misc/icon.png $out/share/pixmaps/assaultcube.png
makeWrapper $out/bin/ac_client $out/bin/${pname} \ makeWrapper $out/bin/ac_client $out/bin/${pname} \
--run "cd $out/$gamedatadir" --add-flags "--home=\$HOME/.assaultcube/v1.2next --init" --run "cd $out/$gamedatadir" --add-flags "--home=\$HOME/.assaultcube/v1.2next --init"
fi fi

2
pkgs/misc/emulators/qmc2/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${pname}-${version}.tar.gz";
sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns"; sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns";
}; };
preBuild = '' preBuild = ''
patchShebangs scripts patchShebangs scripts
''; '';

2
pkgs/tools/filesystems/cpcfs/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
pname = "cpcfs"; pname = "cpcfs";
version = "0.85.4"; version = "0.85.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "derikz"; owner = "derikz";
repo = "cpcfs"; repo = "cpcfs";

2
pkgs/tools/networking/photon/default.nix
View File

@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
installPhase = '' installPhase = ''
mkdir -p "$out"/{bin,share/photon} mkdir -p "$out"/{bin,share/photon}
cp -R photon.py core plugins $out/share/photon cp -R photon.py core plugins $out/share/photon
makeWrapper ${python3Packages.python.interpreter} $out/bin/photon \ makeWrapper ${python3Packages.python.interpreter} $out/bin/photon \
--set PYTHONPATH "$PYTHONPATH:$out/share/photon" \ --set PYTHONPATH "$PYTHONPATH:$out/share/photon" \
--add-flags "-O $out/share/photon/photon.py" --add-flags "-O $out/share/photon/photon.py"

8
pkgs/tools/text/poedit/default.nix
View File

@ -11,13 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0pvd903j2x3h9wh38fhlcn23d0jkjlqnfbdpbvnbhy6al1ngx72w"; sha256 = "0pvd903j2x3h9wh38fhlcn23d0jkjlqnfbdpbvnbhy6al1ngx72w";
}; };
nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook
libxslt xmlto boost libtool pkgconfig ]; libxslt xmlto boost libtool pkgconfig ];
buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ]; buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk2 gtkspell2 hicolor-icon-theme ];
propagatedBuildInputs = [ gettext ]; propagatedBuildInputs = [ gettext ];
preConfigure = " preConfigure = "
patchShebangs bootstrap patchShebangs bootstrap
./bootstrap ./bootstrap
@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
"--with-boost-libdir=${boost.out}/lib" "--with-boost-libdir=${boost.out}/lib"
"CPPFLAGS=-I${nlohmann_json}/include/nlohmann/" "CPPFLAGS=-I${nlohmann_json}/include/nlohmann/"
]; ];
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ gettext ]}") gappsWrapperArgs+=(--prefix PATH : "${stdenv.lib.makeBinPath [ gettext ]}")
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {