diff options
| author | ajs124 <git@ajs124.de> | 2022-05-09 23:52:15 +0100 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2023-09-04 13:54:51 +0200 |
| commit | 44c3cb965f58883a6802c28b4aac29b880d86106 (patch) | |
| tree | 9e947de7865526eba87f567cc53177bac15fac75 /pkgs/os-specific/windows | |
| parent | 2b77e759facf3c621f5d45d20aaa607e3cc3da3b (diff) | |
| download | nixpkgs-44c3cb965f58883a6802c28b4aac29b880d86106.tar nixpkgs-44c3cb965f58883a6802c28b4aac29b880d86106.tar.gz nixpkgs-44c3cb965f58883a6802c28b4aac29b880d86106.tar.bz2 nixpkgs-44c3cb965f58883a6802c28b4aac29b880d86106.tar.lz nixpkgs-44c3cb965f58883a6802c28b4aac29b880d86106.tar.xz nixpkgs-44c3cb965f58883a6802c28b4aac29b880d86106.tar.zst nixpkgs-44c3cb965f58883a6802c28b4aac29b880d86106.zip | |
windows.jom: remove
depends on qt4 versions > 1.1 support qt5, but our qt5 packages do not and most likely will never support windows
Diffstat (limited to 'pkgs/os-specific/windows')
| -rw-r--r-- | pkgs/os-specific/windows/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/windows/jom/default.nix | 32 |
2 files changed, 0 insertions, 34 deletions
diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 12859de8a20..751ef24c647 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -6,8 +6,6 @@ lib.makeScope newScope (self: with self; { cygwinSetup = callPackage ./cygwin-setup { }; - jom = callPackage ./jom { }; - w32api = callPackage ./w32api { }; mingwrt = callPackage ./mingwrt { }; diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix deleted file mode 100644 index dfd3f3ff19c..00000000000 --- a/pkgs/os-specific/windows/jom/default.nix +++ /dev/null @@ -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. - }; -} |