diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-09-04 20:19:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-09-04 20:19:44 +0200 |
| commit | b4cc33304856c45c4965127ea2905c7f20cb4eaa (patch) | |
| tree | c654168463fae5e46c3f0e41c2bc735e27995858 /pkgs/os-specific/windows | |
| parent | 0a1690dd6bf9ed7f3d6d0caeb8036274deafcdac (diff) | |
| parent | fcf38c9baca5f009ceb601353dcb1857c29d3e06 (diff) | |
| download | nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.tar nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.tar.gz nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.tar.bz2 nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.tar.lz nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.tar.xz nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.tar.zst nixpkgs-b4cc33304856c45c4965127ea2905c7f20cb4eaa.zip | |
Merge branch 'master' into staging-next
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 ee993cf48e8..95df515c6bf 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -8,8 +8,6 @@ lib.makeScope newScope (self: with self; { dlfcn = callPackage ./dlfcn { }; - 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. - }; -} |