summaryrefslogtreecommitdiffstats
path: root/pkgs/os-specific/windows
diff options
context:
space:
mode:
authorMatthew Bauer <matthew.bauer@obsidian.systems>2018-08-10 11:51:18 -0400
committerMatthew Bauer <matthew.bauer@obsidian.systems>2018-08-10 11:51:18 -0400
commitf32e9a34c8d07aac3f0000cfb07829cdbac60a17 (patch)
tree15fe362a633e99b74d4ae6f9713d8bf8be44bede /pkgs/os-specific/windows
parentb744586c7bba7a0de9cdc7b7a67bebb42a6e59b5 (diff)
windows: add more meta
‘platforms.windows’ includes all windows platforms. Should prefer this to using assertions.
Diffstat (limited to 'pkgs/os-specific/windows')
-rw-r--r--pkgs/os-specific/windows/libgnurx/default.nix4
-rw-r--r--pkgs/os-specific/windows/mingw-w64/default.nix4
-rw-r--r--pkgs/os-specific/windows/mingwrt/default.nix6
-rw-r--r--pkgs/os-specific/windows/w32api/default.nix4
-rw-r--r--pkgs/os-specific/windows/wxMSW-2.8/default.nix6
5 files changed, 19 insertions, 5 deletions
diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix
index f50a0d9f503e..88af53dd046e 100644
--- a/pkgs/os-specific/windows/libgnurx/default.nix
+++ b/pkgs/os-specific/windows/libgnurx/default.nix
@@ -8,4 +8,8 @@ in stdenv.mkDerivation rec {
url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${name}-src.tar.gz";
sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi";
};
+
+ meta = {
+ platforms = stdenv.lib.platforms.windows;
+ };
}
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index e945f6f7b314..dd151f696c82 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -6,4 +6,8 @@ stdenv.mkDerivation {
dontStrip = true;
hardeningDisable = [ "stackprotector" "fortify" ];
patches = [ ./osvi.patch ];
+
+ meta = {
+ platforms = stdenv.lib.platforms.windows;
+ };
}
diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix
index b3c7ef310981..416ae7624c33 100644
--- a/pkgs/os-specific/windows/mingwrt/default.nix
+++ b/pkgs/os-specific/windows/mingwrt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, lib, fetchurl }:
+{ stdenv, lib, fetchurl }:
stdenv.mkDerivation rec {
name = "mingwrt-5.0.2";
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91p0";
};
- meta.platforms = [ lib.systems.inspect.isMinGW ];
+ meta = {
+ platforms = lib.platforms.windows;
+ };
dontStrip = true;
hardeningDisable = [ "stackprotector" "fortify" ];
diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix
index 51d8dafd9c88..2fe989bb2f49 100644
--- a/pkgs/os-specific/windows/w32api/default.nix
+++ b/pkgs/os-specific/windows/w32api/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb";
};
- meta.platforms = [ lib.systems.inspect.isMinGW ];
+ meta = {
+ platforms = lib.platforms.windows;
+ };
dontStrip = true;
}
diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
index 8770140cc633..748bf39a1f20 100644
--- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix
+++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix
@@ -2,8 +2,6 @@
, hostPlatform
}:
-assert hostPlatform.isWindows;
-
stdenv.mkDerivation {
name = "wxMSW-2.8.11";
@@ -32,4 +30,8 @@ stdenv.mkDerivation {
";
passthru = {inherit compat24 compat26 unicode;};
+
+ meta = {
+ platforms = stdenv.lib.platforms.windows;
+ };
}