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

Merge pull request #39173 from knedlsepp/enable-xskat-darwin

Browse Source 
Enable some imake builds on darwin
This commit is contained in:
Daiderd Jordan 2018-04-20 08:37:19 +02:00 committed by GitHub
commit d7d692778c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/misc/gv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, Xaw3d, ghostscriptX, perl }: { stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }:
let let
name = "gv-3.7.4"; name = "gv-3.7.4";
@ -11,7 +11,18 @@ stdenv.mkDerivation {
sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1"; sha256 = "0q8s43z14vxm41pfa8s5h9kyyzk1fkwjhkiwbf2x70alm6rv6qi1";
}; };
buildInputs = [ Xaw3d ghostscriptX perl ]; configureFlags = stdenv.lib.optionals stdenv.isDarwin [
"--enable-SIGCHLD-fallback"
];
buildInputs = [
Xaw3d
ghostscriptX
perl
] ++ stdenv.lib.optionals stdenv.isDarwin [
pkgconfig
libiconv
];
patchPhase = '' patchPhase = ''
sed 's|\<gs\>|${ghostscriptX}/bin/gs|g' -i "src/"*.in sed 's|\<gs\>|${ghostscriptX}/bin/gs|g' -i "src/"*.in
@ -32,6 +43,6 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.gpl3Plus; license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ ]; maintainers = [ ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice platforms = stdenv.lib.platforms.unix;
}; };
} }

2
pkgs/applications/misc/oneko/default.nix
View File

@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.daidouji.com/oneko/"; homepage = "http://www.daidouji.com/oneko/";
license = licenses.publicDomain; license = licenses.publicDomain;
maintainers = [ maintainers.xaverdh ]; maintainers = [ maintainers.xaverdh ];
platforms = platforms.linux; platforms = platforms.unix;
}; };
} }

2
pkgs/development/libraries/Xaw3d/default.nix
View File

@ -12,6 +12,6 @@ stdenv.mkDerivation {
meta = { meta = {
description = "3D widget set based on the Athena Widget set"; description = "3D widget set based on the Athena Widget set";
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
}; };
} }

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

@ -30,7 +30,7 @@ stdenv.mkDerivation {
meta = { meta = {
inherit (s) version; inherit (s) version;
description = ''Famous german card game''; description = ''Famous german card game'';
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
license = stdenv.lib.licenses.free; license = stdenv.lib.licenses.free;
longDescription = ''Play the german card game Skat against the AI or over IRC.''; longDescription = ''Play the german card game Skat against the AI or over IRC.'';
homepage = http://www.xskat.de/; homepage = http://www.xskat.de/;

3
pkgs/games/xsok/default.nix
View File

@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
sed -e '/chown /d' -i src/Imakefile sed -e '/chown /d' -i src/Imakefile
sed -e '/chmod /d' -i src/Imakefile sed -e '/chmod /d' -i src/Imakefile
sed -e '/InstallAppDefaults/d' -i src/Imakefile sed -e '/InstallAppDefaults/d' -i src/Imakefile
sed -e 's/CC = gcc/CC = cc/g' -i src/Imakefile
''; '';
makeFlags = ["BINDIR=$(out)/bin"]; makeFlags = ["BINDIR=$(out)/bin"];
@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
description = "A generic Sokoban game for X11"; description = "A generic Sokoban game for X11";
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.unix;
homepage = https://tracker.debian.org/pkg/xsok; homepage = https://tracker.debian.org/pkg/xsok;
}; };
} }

3
pkgs/servers/x11/xorg/default.nix
View File

@ -2570,6 +2570,9 @@ let
url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2; url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2;
sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd";
}; };
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
'';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ]; buildInputs = [ ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;