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

Merge branch 'master' into add-missing-licenses

Browse Source 
Conflicts:
	pkgs/development/libraries/exiv2/default.nix
        Set license to gpl2Plus
This commit is contained in:
Pascal Wittmann
2018-08-06 12:04:52 +02:00
parent 85afc926d8 6820e2f0dd
commit f7be21f4c9
249 changed files with 8809 additions and 5372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/games/cataclysm-dda/common.nix
View File

@@ -74,7 +74,7 @@ let
installXDGAppLauncher = ''
launcher="$out/share/applications/cataclysm-dda.desktop"
install -D -m 444 data/xdg/com.cataclysmdda.cataclysm-dda.desktop -T "$launcher"
install -D -m 444 data/xdg/*cataclysm-dda.desktop -T "$launcher"
sed -i "$launcher" -e "s,\(Exec=\)\(cataclysm-tiles\),\1$out/bin/\2,"
install -D -m 444 data/xdg/cataclysm-dda.svg -t $out/share/icons/hicolor/scalable/apps
'';

4
pkgs/games/empty-epsilon/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python }:
{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python3 }:
let
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ serious-proton sfml glew libX11 python ];
buildInputs = [ serious-proton sfml glew libX11 python3 ];
cmakeFlags = [
"-DSERIOUS_PROTON_DIR=${serious-proton.src}"