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

Merge pull request #51205 from matthewbauer/more-setup-hooks

Browse Source 
Add premake & imake setup hook
This commit is contained in:
Matthew Bauer 2018-11-29 19:36:25 -06:00 committed by GitHub
commit 76c7a8bac0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 226 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/applications/audio/distrho/default.nix
View File

@ -1,7 +1,13 @@
{ stdenv, fetchFromGitHub, alsaLib, fftwSinglePrec, freetype, libjack2
, pkgconfig, premake3, xorg, ladspa-sdk }:
, pkgconfig, ladspa-sdk, premake3
, libX11, libXcomposite, libXcursor, libXext, libXinerama, libXrender
}:
stdenv.mkDerivation rec {
let
premakeos = if stdenv.hostPlatform.isDarwin then "osx"
else if stdenv.hostPlatform.isWindows then "mingw"
else "linux";
in stdenv.mkDerivation rec {
name = "distrho-ports-${version}";
version = "2018-04-16";
@ -12,27 +18,26 @@ stdenv.mkDerivation rec {
sha256 = "0l4zwl4mli8jzch32a1fh7c88r9q17xnkxsdw17ds5hadnxlk12v";
};
configurePhase = ''
runHook preConfigure
sh ./scripts/premake-update.sh ${premakeos}
runHook postConfigure
'';
patchPhase = ''
sed -e "s#@./scripts#sh scripts#" -i Makefile
'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig premake3 ];
buildInputs = [
alsaLib fftwSinglePrec freetype libjack2 premake3
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
xorg.libXinerama xorg.libXrender ladspa-sdk
alsaLib fftwSinglePrec freetype libjack2
libX11 libXcomposite libXcursor libXext
libXinerama libXrender ladspa-sdk
];
buildPhase = ''
sh ./scripts/premake-update.sh linux
make lv2
'';
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/lib/lv2
cp -a bin/lv2/* $out/lib/lv2/
'';
makeFlags = "PREFIX=$(out)";
meta = with stdenv.lib; {
homepage = http://distrho.sourceforge.net;

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xorg, xlibsWrapper }:
{ stdenv, fetchurl, imake, gccmakedep, xlibsWrapper }:
stdenv.mkDerivation rec {
version = "1.2.sakura.5";
@ -8,14 +8,11 @@ stdenv.mkDerivation rec {
url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz";
sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f";
};
buildInputs = [ xorg.imake xorg.gccmakedep xlibsWrapper ];
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ xlibsWrapper ];
configurePhase = "xmkmf";
installPhase = ''
make install BINDIR=$out/bin
make install.man MANPATH=$out/share/man
'';
makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
installTargets = "install install.man";
meta = with stdenv.lib; {
description = "Creates a cute cat chasing around your mouse cursor";

14
pkgs/applications/misc/xcruiser/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, gccmakedep, xorg }:
{ stdenv, fetchurl, gccmakedep, xorg, imake, libXt, libXaw, libXpm, libXext }:
stdenv.mkDerivation {
name = "xcruiser-0.30";
@ -8,13 +8,13 @@ stdenv.mkDerivation {
sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi";
};
buildInputs = with xorg; [ gccmakedep imake libXt libXaw libXpm libXext ];
nativeBuildInputs = [ gccmakedep imake ];
buildInputs = [ libXt libXaw libXpm libXext ];
configurePhase = "xmkmf -a";
preBuild = ''
makeFlagsArray=( BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults)
'';
makeFlags = [
"BINDIR=$(out)/bin"
"XAPPLOADDIR=$(out)/etc/X11/app-defaults"
];
meta = with stdenv.lib; {
description = "Filesystem visualization utility";

19
pkgs/applications/misc/xmove/default.nix
View File

@ -1,19 +0,0 @@
{stdenv, fetchurl, libX11, libXi, imake, xauth, libXau}:
stdenv.mkDerivation {
name = "xmove-2.0b2";
src = fetchurl {
url = mirror://debian/pool/main/x/xmove/xmove_2.0beta2.orig.tar.gz;
sha256 = "0q310k3bi39vdk0kqqvsahnb1k6lx9hlx80iyxnkq59l6jxnhyhf";
};
buildPhase = "cd xmove; sed -e 's/.*No address for our host.*/{hp = gethostbyname(\"localhost\");};/' -i main.c; cp ../man/man1/xmove.1 xmove.man ; xmkmf; make; cd .. ; cd xmovectrl ; cp ../man/man1/xmovectrl.1 xmovectrl.man; xmkmf; make ; cd ..";
installPhase = "cd xmove; make install install.man MANDIR=\${out}/man/man1 BINDIR=\${out}/bin; cd .. ; cd xmovectrl ; make install install.man MANDIR=\${out}/man/man1 BINDIR=\${out}/bin; cd ..";
buildInputs = [libX11 libXi imake xauth libXau];
meta = {
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.mit;
};
}

19
pkgs/applications/misc/xxkb/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake
, svgSupport ? true, librsvg, glib, gdk_pixbuf, pkgconfig
{ stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep
, svgSupport ? false, librsvg, glib, gdk_pixbuf, pkgconfig
}:
assert svgSupport ->
@ -13,20 +13,21 @@ stdenv.mkDerivation rec {
sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf";
};
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [
imake
libX11 libXt libXext libXpm
] ++ stdenv.lib.optionals svgSupport [ librsvg glib gdk_pixbuf pkgconfig ];
outputs = [ "out" "man" ];
configurePhase = ''
xmkmf ${stdenv.lib.optionalString svgSupport "-DWITH_SVG_SUPPORT"}
'';
imakeFlags = stdenv.lib.optionalString svgSupport "-DWITH_SVG_SUPPORT";
preBuild = ''
makeFlagsArray=( BINDIR=$out/bin PIXMAPDIR=$out/share/xxkb XAPPLOADDIR=$out/etc/X11/app-defaults MANDIR=$man/share/man )
'';
makeFlags = [
"BINDIR=${placeholder "out"}/bin"
"PIXMAPDIR=${placeholder "out"}/share/xxkb"
"XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults"
"MANDIR=${placeholder "man"}/share/man"
];
installTargets = "install install.man";

4
pkgs/applications/networking/remote/ssvnc/default.nix
View File

@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
buildInputs = [ imake zlib jdk libX11 libXt libXmu libXaw libXext libXpm openjpeg openssl ];
configurePhase = "makeFlags=PREFIX=$out";
dontUseImakeConfigure = true;
makeFlags = "PREFIX=$(out)";
hardeningDisable = [ "format" ];

13
pkgs/applications/science/astronomy/xearth/default.nix
View File

@ -1,21 +1,20 @@
{ stdenv, fetchurl, xorg }:
{ stdenv, fetchurl, imake, gccmakedep, libXt, libXext }:
stdenv.mkDerivation rec {
name = "xearth-${version}";
version = "1.1";
src = fetchurl {
url = "http://xearth.org/${name}.tar.gz";
sha256 = "bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c";
};
buildInputs = with xorg; [ imake libXt libXext ];
dontAddPrefix = true;
configureScript="xmkmf";
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ libXt libXext ];
installFlags=[ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"];
installTargets="install install.man";
meta = with stdenv.lib; {
description = "sets the X root window to an image of the Earth";
homepage = "http://xplanet.org";

4
pkgs/applications/science/electronics/tkgate/1.x.nix
View File

@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs";
};
buildInputs = [ tcl tk libX11 which yacc flex imake xproto gccmakedep ];
nativeBuildInputs = [ which yacc flex imake gccmakedep ];
buildInputs = [ tcl tk libX11 xproto ];
dontUseImakeConfigure = true;
patchPhase = ''
sed -i config.h \

2
pkgs/applications/science/math/R/default.nix
View File

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
sha256 = "0463bff5eea0f3d93fa071f79c18d0993878fd4f2e18ae6cf22c1639d11457ed";
};
dontUseImakeConfigure = true;
buildInputs = [
bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
pango pcre perl readline texLive xz zlib less texinfo graphviz icu

12
pkgs/applications/window-managers/larswm/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, imake, libX11, libXext, libXmu}:
{ stdenv, fetchurl, imake, gccmakedep, libX11, libXext, libXmu }:
stdenv.mkDerivation {
name = "larswm-7.5.3";
@ -8,13 +8,11 @@ stdenv.mkDerivation {
sha256 = "1xmlx9g1nhklxjrg0wvsya01s4k5b9fphnpl9zdwp29mm484ni3v";
};
buildInputs = [ imake libX11 libXext libXmu ];
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ libX11 libXext libXmu ];
configurePhase = ''
xmkmf
makeFlags="BINDIR=$out/bin MANPATH=$out/share/man"
installTargets="install install.man"
'';
makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
installTargets = "install install.man";
meta = {
homepage = http://www.fnurt.net/larswm;

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

@ -8,6 +8,7 @@ stdenv.mkDerivation {
url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2;
sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid";
};
dontUseImakeConfigure = true;
nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ];
buildInputs = [ libXpm libXp ];
propagatedBuildInputs = [ xlibsWrapper libXmu ];

24
pkgs/development/libraries/bootil/default.nix
View File

@ -23,21 +23,21 @@ stdenv.mkDerivation rec {
url = https://github.com/garrynewman/bootil/pull/22.patch;
name = "github-pull-request-22.patch";
sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2";
})];
}) ];
platform =
if stdenv.isLinux then "linux"
else if stdenv.isDarwin then "macosx"
else throw "unrecognized system ${stdenv.hostPlatform.system}";
# Avoid guessing where files end up. Just use current directory.
postPatch = ''
substituteInPlace projects/premake4.lua \
--replace 'location ( os.get() .. "/" .. _ACTION )' 'location ( ".." )'
substituteInPlace projects/bootil.lua \
--replace 'targetdir ( "../lib/" .. os.get() .. "/" .. _ACTION )' 'targetdir ( ".." )'
'';
buildInputs = [ premake4 ];
configurePhase = "premake4 --file=projects/premake4.lua gmake";
makeFlags = "-C projects/${platform}/gmake";
nativeBuildInputs = [ premake4 ];
premakefile = "projects/premake4.lua";
installPhase = ''
mkdir -p $out/lib
cp lib/${platform}/gmake/libbootil_static.a $out/lib/
cp -r include $out/
install -D libbootil_static.a $out/lib/libbootil_static.a
cp -r include $out
'';
}

6
pkgs/development/libraries/yojimbo/default.nix
View File

@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ premake5 doxygen ];
propagatedBuildInputs = [ libsodium mbedtls ];
buildPhase = ''
premake5 gmake
make all
postBuild = ''
premake5 docs
'';
@ -28,6 +26,8 @@ stdenv.mkDerivation rec {
cp -r docs/html $out/share/doc/yojimbo
'';
doCheck = true;
meta = with stdenv.lib; {
description = "A network library for client/server games with dedicated servers";
longDescription = ''

3
pkgs/development/tools/misc/premake/3.nix
View File

@ -18,6 +18,9 @@ stdenv.mkDerivation {
install -Dm755 bin/premake $out/bin/premake
'';
premake_cmd = "premake3";
setupHook = ./setup-hook.sh;
meta = {
homepage = http://industriousone.com/premake;
description = "A simple build configuration and project generation tool using lua";

3
pkgs/development/tools/misc/premake/5.nix
View File

@ -31,6 +31,9 @@ stdenv.mkDerivation rec {
install -Dm755 bin/release/premake5 $out/bin/premake5
'';
premake_cmd = "premake5";
setupHook = ./setup-hook.sh;
meta = {
homepage = https://premake.github.io;
description = "A simple build configuration and project generation tool using lua";

7
pkgs/development/tools/misc/premake/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "1017rd0wsjfyq2jvpjjhpszaa7kmig6q1nimw76qx3cjz2868lrn";
};
buildInputs = [ unzip ];
nativeBuildInputs = [ unzip ];
buildPhase = ''
make -C build/gmake.unix/
@ -22,11 +22,14 @@ stdenv.mkDerivation {
install -Dm755 bin/release/premake4 $out/bin/premake4
'';
premake_cmd = "premake4";
setupHook = ./setup-hook.sh;
meta = with stdenv.lib; {
homepage = http://industriousone.com/premake;
description = "A simple build configuration and project generation tool using lua";
license = stdenv.lib.licenses.bsd3;
platforms = platforms.linux;
platforms = platforms.unix;
maintainers = [ maintainers.bjornfor ];
};
}

19
pkgs/development/tools/misc/premake/setup-hook.sh Normal file
View File

@ -0,0 +1,19 @@
premakeConfigurePhase() {
runHook preConfigure
local flagsArray=(
${premakefile:+--file=$premakefile}
$premakeFlags ${premakeFlagsArray[@]}
${premakeBackend:-gmake}
)
echoCmd 'configure flags' "${flagsArray[@]}"
@premake_cmd@ "${flagsArray[@]}"
runHook postConfigure
}
if [ -z "$configurePhase" ]; then
configurePhase=premakeConfigurePhase
fi

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

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
else if stdenv.isDarwin then "gmad_osx"
else "gmad";
configurePhase = "premake4 --bootil_lib=${bootil}/lib --bootil_inc=${bootil}/include gmake";
premakeFlags = "--bootil_lib=${bootil}/lib --bootil_inc=${bootil}/include";
installPhase = ''
mkdir -p $out/bin

16
pkgs/games/tome4/default.nix
View File

@ -25,9 +25,10 @@ in stdenv.mkDerivation rec {
sha256 = "0mc5dgh2x9nbili7gy6srjhb23ckalf08wqq2amyjr5rq392jvd7";
};
nativeBuildInputs = [ premake4 makeWrapper unzip ];
nativeBuildInputs = [ makeWrapper unzip premake4 ];
# tome4 vendors quite a few libraries so someone might want to look into avoiding that...
# tome4 vendors quite a few libraries so someone might want to look
# into avoiding that...
buildInputs = [
libGLU openal libpng libvorbis SDL2 SDL2_ttf SDL2_image
];
@ -36,20 +37,11 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = false;
NIX_CFLAGS_COMPILE = [
"-I${SDL2.dev}/include/SDL2"
"-I${SDL2_image}/include/SDL2"
"-I${SDL2_ttf}/include/SDL2"
];
postPatch = ''
substituteInPlace premake4.lua \
--replace "/opt/SDL-2.0/include/SDL2" "${SDL2.dev}/include/SDL2" \
--replace "/usr/include/GL" "/run/opengl-driver/include"
'';
preConfigure = ''
premake4 gmake
'';
makeFlags = [ "config=release" ];
# The wrapper needs to cd into the correct directory as tome4's detection of

18
pkgs/games/xsnow/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libXt, libXpm, libXext, imake }:
{ stdenv, fetchurl, libXt, libXpm, libXext, imake, gccmakedep }:
stdenv.mkDerivation rec {
@ -10,25 +10,17 @@ stdenv.mkDerivation rec {
sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh";
};
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [
libXt libXpm libXext imake
libXt libXpm libXext
];
buildPhase = ''
xmkmf
make
'';
installPhase = ''
mkdir -p $out/bin $out/share/man/man1
cp xsnow $out/bin/
cp xsnow.1 $out/share/man/man1/
'';
makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
meta = {
description = "An X-windows application that will let it snow on the root, in between and on windows";
homepage = http://janswaal.home.xs4all.nl/Xsnow/;
license = stdenv.lib.licenses.unfree;
maintainers = [ stdenv.lib.maintainers.robberer ];
};
};
}

12
pkgs/misc/screensavers/xautolock/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, xlibsWrapper, imake, libXScrnSaver, scrnsaverproto }:
{ stdenv, fetchurl, xlibsWrapper
, imake, gccmakedep, libXScrnSaver, scrnsaverproto }:
stdenv.mkDerivation rec {
name = "xautolock-2.2";
@ -14,10 +15,13 @@ stdenv.mkDerivation rec {
})
];
NIX_CFLAGS_COMPILE = "-DSYSV";
makeFlags="BINDIR=\${out}/bin MANPATH=\${out}/man";
preBuild = "xmkmf";
makeFlags = [
"BINDIR=$(out)/bin"
"MANPATH=$(out)/share/man"
];
installTargets = "install install.man";
buildInputs = [xlibsWrapper imake libXScrnSaver scrnsaverproto];
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ xlibsWrapper libXScrnSaver scrnsaverproto ];
meta = with stdenv.lib; {
description = "A program that launches a given program when your X session has been idle for a given time.";
homepage = http://www.ibiblio.org/pub/linux/X11/screensavers;

7
pkgs/servers/nas/default.nix
View File

@ -16,12 +16,9 @@ in stdenv.mkDerivation {
buildInputs = [ xproto libXau libXt libXext libXaw libXpm ];
buildPhase = ''
xmkmf
make WORLDOPTS="" World
'';
buildFlags = [ "WORLDOPTS=" "World" ];
installFlags = "LDLIBS=-lfl DESTDIR=\${out}";
installFlags = [ "LDLIBS=-lfl" "DESTDIR=${placeholder "out"}" ];
postInstall = ''
mv $out/${xorgcffiles}/* $out

1
pkgs/servers/x11/xorg/darwin-imake-setup-hook.sh
View File

@ -1 +0,0 @@
export IMAKECPP="@tradcpp@/bin/tradcpp"

19
pkgs/servers/x11/xorg/imake-setup-hook.sh Normal file
View File

@ -0,0 +1,19 @@
export IMAKECPP="@tradcpp@/bin/tradcpp"
imakeConfigurePhase() {
runHook preConfigure
echoCmd 'configuring with imake'
if [ -z "${imakefile:-}" -a ! -e Imakefile ]; then
echo "no Imakefile, doing nothing"
else
xmkmf -a
fi
runHook postConfigure
}
if [ -z "$dontUseImakeConfigure" -a -z "$configurePhase" ]; then
configurePhase=imakeConfigurePhase
fi

8
pkgs/servers/x11/xorg/overrides.nix
View File

@ -63,12 +63,12 @@ self: super:
inherit (self) xorgcffiles;
x11BuildHook = ./imake.sh;
patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch];
setupHook = if stdenv.isDarwin then ./darwin-imake-setup-hook.sh else null;
CFLAGS = [ "-DIMAKE_COMPILETIME_CPP=\\\"${if stdenv.isDarwin
setupHook = ./imake-setup-hook.sh;
CFLAGS = [ ''-DIMAKE_COMPILETIME_CPP='"${if stdenv.isDarwin
then "${tradcpp}/bin/cpp"
else "gcc"}\\\""
else "gcc"}"' ''
];
tradcpp = if stdenv.isDarwin then tradcpp else null;
inherit tradcpp;
});
mkfontdir = super.mkfontdir.overrideAttrs (attrs: {

16
pkgs/tools/X11/x2x/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, imake, libX11, libXtst, libXext}:
{ stdenv, fetchurl, imake, libX11, libXtst, libXext, gccmakedep }:
stdenv.mkDerivation {
name = "x2x-1.27";
@ -8,20 +8,16 @@ stdenv.mkDerivation {
sha256 = "0dha0kn1lbc4as0wixsvk6bn4innv49z9a0sm5wlx4q1v0vzqzyj";
};
buildInputs = [ imake libX11 libXtst libXext ];
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ libX11 libXtst libXext ];
hardeningDisable = [ "format" ];
configurePhase = ''
xmkmf
makeFlags="BINDIR=$out/bin x2x"
'';
buildFlags = [ "x2x" ];
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/man/man1
cp x2x $out/bin/
cp x2x.1 $out/man/man1/
install -D x2x $out/bin/x2x
install -D x2x.1 $out/man/man1/x2x.1
'';
meta = with stdenv.lib; {

22
pkgs/tools/X11/xbrightness/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, xorg }:
{ stdenv, fetchurl, imake, gccmakedep
, libX11, libXaw, libXext, libXmu, libXpm, libXxf86vm }:
stdenv.mkDerivation {
@ -8,22 +9,11 @@ stdenv.mkDerivation {
sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e";
};
buildInputs = [
xorg.imake
xorg.libX11
xorg.libXaw
xorg.libXext
xorg.libXmu
xorg.libXpm
xorg.libXxf86vm
];
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ libX11 libXaw libXext libXmu libXpm libXxf86vm ];
configurePhase = "xmkmf";
installPhase = ''
make install BINDIR=$out/bin
make install.man MANPATH=$out/share/man
'';
makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
installTargets = "install install.man";
meta = {
description = "X11 brigthness and gamma software control";

15
pkgs/tools/X11/xvkbd/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, imake, libXt, libXaw, libXtst, libXi, libXpm, xextproto, gccmakedep, Xaw3d }:
{ stdenv, fetchurl, imake, libXt, libXaw, libXtst
, libXi, libXpm, xextproto, gccmakedep, Xaw3d }:
stdenv.mkDerivation rec {
name = "xvkbd-${version}";
@ -8,12 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "17csj6x5zm3g67izfwhagkal1rbqzpw09lqmmlyrjy3vzgfkf75q";
};
buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ];
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ libXt libXaw libXtst xextproto libXi Xaw3d libXpm ];
installTargets = [ "install" "install.man" ];
preBuild = ''
makeFlagsArray=( BINDIR=$out/bin XAPPLOADDIR=$out/etc/X11/app-defaults MANPATH=$out/man )
'';
configurePhase = '' xmkmf -a '';
makeFlags = [
"BINDIR=$(out)/bin"
"XAPPLOADDIR=$(out)/etc/X11/app-defaults"
"MANPATH=$(out)/man"
];
meta = with stdenv.lib; {
description = "Virtual keyboard for X window system";

17
pkgs/tools/X11/xzoom/default.nix
View File

@ -1,4 +1,5 @@
{stdenv, fetchurl, libX11, imake, libXext, libXt}:
{ stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}:
stdenv.mkDerivation rec {
name = "${pname}-${version}.${patchlevel}";
pname = "xzoom";
@ -16,12 +17,16 @@ stdenv.mkDerivation rec {
sha256 = "0zhc06whbvaz987bzzzi2bz6h9jp6rv812qs7b71drivvd820qbh";
})
];
buildInputs = [libX11 imake libXext libXt];
configurePhase = ''
xmkmf
makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANPATH=$out/share/man"
'';
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ libX11 libXext libXt ];
makeFlags = [
"PREFIX=$(out)"
"BINDIR=$(out)/bin"
"MANPATH=$(out)/share/man"
];
installTargets = "install install.man";
meta = {
inherit version;

40
pkgs/tools/admin/tightvnc/default.nix
View File

@ -10,15 +10,14 @@ stdenv.mkDerivation {
};
# for the builder script
inherit xauth fontDirectories perl;
gcc = stdenv.cc.cc;
inherit fontDirectories;
hardeningDisable = [ "format" ];
buildInputs = [ xlibsWrapper zlib libjpeg imake gccmakedep libXmu libXaw
libXpm libXp xauth openssh ];
patchPhase = ''
postPatch = ''
fontPath=
for i in $fontDirectories; do
for j in $(find $i -name fonts.dir); do
@ -27,37 +26,38 @@ stdenv.mkDerivation {
done
sed -i "s@/usr/bin/ssh@${openssh}/bin/ssh@g" vncviewer/vncviewer.h
'';
buildPhase = ''
xmkmf
make World
sed -e 's@/usr/bin/perl@${perl}/bin/perl@' \
-e 's@unix/:7100@'$fontPath'@' \
-i vncserver
cd Xvnc
sed -e 's@.* CppCmd .*@#define CppCmd '$gcc'/bin/cpp@' -i config/cf/linux.cf
sed -e 's@.* CppCmd .*@#define CppCmd '$gcc'/bin/cpp@' -i config/cf/Imake.tmpl
sed -e 's@.* CppCmd .*@#define CppCmd cpp@' -i Xvnc/config/cf/linux.cf
sed -e 's@.* CppCmd .*@#define CppCmd cpp@' -i Xvnc/config/cf/Imake.tmpl
sed -i \
-e 's@"uname","xauth","Xvnc","vncpasswd"@"uname","Xvnc","vncpasswd"@g' \
-e "s@\<xauth\>@${xauth}/bin/xauth@g" \
../vncserver
./configure
make
cd ..
vncserver
'';
preInstall = ''
mkdir -p $out/bin
mkdir -p $out/share/man/man1
'';
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/share/man/man1
runHook preInstall
./vncinstall $out/bin $out/share/man
runHook postInstall
'';
postInstall = ''
# fix HTTP client:
t=$out/share/tightvnc
mkdir -p $t
sed -i "s@/usr/local/vnc/classes@$out/vnc/classes@g" $out/bin/vncserver
cp -r classes $t
mkdir -p $out/share/tightvnc
cp -r classes $out/share/tightvnc
substituteInPlace $out/bin/vncserver \
--replace /usr/local/vnc/classes $out/share/tightvnc/classes
'';
meta = {

12
pkgs/tools/graphics/transfig/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, zlib, libjpeg, libpng, imake}:
{ stdenv, fetchurl, zlib, libjpeg, libpng, imake, gccmakedep }:
stdenv.mkDerivation rec {
name = "transfig-3.2.4";
@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4";
};
buildInputs = [zlib libjpeg libpng imake];
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ zlib libjpeg libpng ];
patches = [
./patch-fig2dev-dev-Imakefile
@ -45,12 +46,7 @@ stdenv.mkDerivation rec {
runHook postPatch
'';
preBuild = ''
xmkmf
make Makefiles
'';
makeFlags = [ "CC=cc" ];
makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
preInstall = ''
mkdir -p $out

14
pkgs/tools/misc/otfcc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, premake5, ninja }:
{ stdenv, fetchFromGitHub, premake5 }:
stdenv.mkDerivation rec {
name = "otfcc-${version}";
@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "1rnjfqqyc6d9nhlh8if9k37wk94mcwz4wf3k239v6idg48nrk10b";
};
nativeBuildInputs = [ premake5 ninja ];
nativeBuildInputs = [ premake5 ];
configurePhase = ''
premake5 ninja
# Don’t guess where our makefiles will end up. Just use current
# directory.
patchPhase = ''
substituteInPlace premake5.lua \
--replace 'location "build/gmake"' 'location "."'
'';
ninjaFlags = let x = if stdenv.hostPlatform.isi686 then "x86" else "x64"; in
[ "-C" "build/ninja" "otfccdump_release_${x}" "otfccbuild_release_${x}" ];
installPhase = ''
mkdir -p $out/bin
cp bin/release-x*/otfcc* $out/bin/

10
pkgs/tools/networking/x11-ssh-askpass/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, xlibsWrapper, imake }:
{ stdenv, fetchurl, xlibsWrapper, imake, gccmakedep }:
stdenv.mkDerivation {
name = "x11-ssh-askpass-1.2.4.1";
@ -10,16 +10,16 @@ stdenv.mkDerivation {
sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88";
};
nativeBuildInputs = [ imake ];
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ xlibsWrapper ];
configureFlags = [
"--with-app-defaults-dir=$out/etc/X11/app-defaults"
];
preBuild = ''
xmkmf
make includes
dontUseImakeConfigure = true;
postConfigure = ''
xmkmf -a
'';
installTargets = [ "install" "install.man" ];

13
pkgs/tools/video/vncrec/default.nix
View File

@ -12,16 +12,17 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [
libX11 xproto imake gccmakedep libXt libXmu libXaw
libX11 xproto libXt libXmu libXaw
libXext xextproto libSM libICE libXpm libXp
];
buildPhase = ''xmkmf && make World'';
installPhase = ''
make DESTDIR=$out BINDIR=/bin MANDIR=/share/man/man1 install install.man
'';
makeFlags = [
"BINDIR=${placeholder "out"}/bin"
"MANDIR=${placeholder "out"}/share/man"
];
installTargets = "install install.man";
meta = {
description = "VNC recorder";

2
pkgs/top-level/all-packages.nix
View File

@ -20089,8 +20089,6 @@ with pkgs;
xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { };
xmove = callPackage ../applications/misc/xmove { };
xmp = callPackage ../applications/audio/xmp { };
xnee = callPackage ../tools/X11/xnee { };