alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases 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;
dontConfigure = true;
nativeBuildInputs = [ imagemagick autoPatchelfHook desktop-file-utils ];
buildInputs = [ qtmultimedia stdenv.cc.cc ];

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

@ -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
'';

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

@ -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

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";
sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns";
};
preBuild = ''
patchShebangs scripts
'';

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

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

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

@ -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"

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

@ -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; {