mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
windows.jom: remove
depends on qt4 versions > 1.1 support qt5, but our qt5 packages do not and most likely will never support windows
This commit is contained in:
parent
2b77e759fa
commit
44c3cb965f
|
@ -6,8 +6,6 @@ lib.makeScope newScope (self: with self; {
|
||||||
|
|
||||||
cygwinSetup = callPackage ./cygwin-setup { };
|
cygwinSetup = callPackage ./cygwin-setup { };
|
||||||
|
|
||||||
jom = callPackage ./jom { };
|
|
||||||
|
|
||||||
w32api = callPackage ./w32api { };
|
w32api = callPackage ./w32api { };
|
||||||
|
|
||||||
mingwrt = callPackage ./mingwrt { };
|
mingwrt = callPackage ./mingwrt { };
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
{ lib, stdenv, fetchgit, qt48, qmake4Hook, flex }:
|
|
||||||
|
|
||||||
# At the time of committing this, the expression fails for me to cross-build in
|
|
||||||
# both mingw32 and mingw64.
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
pname = "jom";
|
|
||||||
version = "1.0.11";
|
|
||||||
|
|
||||||
src = fetchgit {
|
|
||||||
url = "git://gitorious.org/qt-labs/jom.git";
|
|
||||||
rev = "c91a204b05f97eef3c73aaaba3036e20f79fd487";
|
|
||||||
sha256 = "6d3ac84f83bb045213903d9d5340c0447c8fe41671d1dcdeae5c40b66d62ccbf";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ qt48 ];
|
|
||||||
nativeBuildInputs = [ flex qmake4Hook ];
|
|
||||||
|
|
||||||
QTDIR = qt48;
|
|
||||||
|
|
||||||
# cmakeFlags = [ "-DWIN32=1" "-DCMAKE_SYSTEM_NAME=Windows" "-DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres" ];
|
|
||||||
|
|
||||||
preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
|
||||||
export NIX_CROSS_CFLAGS_COMPILE=-fpermissive
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "https://qt-project.org/wiki/jom";
|
|
||||||
description = "Clone of nmake supporting multiple independent commands in parallel";
|
|
||||||
license = lib.licenses.gpl2Plus; # Explicitly, GPLv2 or GPLv3, but not later.
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Reference in a new issue