diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-03 00:58:11 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-05-03 13:09:20 -0500 |
commit | 143978a477e4891bd94be6d9fcf257f726b403cd (patch) | |
tree | b93f545ca15d5dd7410e7ec13be3df1709b935c6 /pkgs/development | |
parent | 3216cf6cdf5a9d0e77af10add1a9cd5c0d6106c2 (diff) | |
download | nixlib-143978a477e4891bd94be6d9fcf257f726b403cd.tar nixlib-143978a477e4891bd94be6d9fcf257f726b403cd.tar.gz nixlib-143978a477e4891bd94be6d9fcf257f726b403cd.tar.bz2 nixlib-143978a477e4891bd94be6d9fcf257f726b403cd.tar.lz nixlib-143978a477e4891bd94be6d9fcf257f726b403cd.tar.xz nixlib-143978a477e4891bd94be6d9fcf257f726b403cd.tar.zst nixlib-143978a477e4891bd94be6d9fcf257f726b403cd.zip |
treewide: remove platform assertions
linux: readd assertion
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/oraclejdk/jdk10-linux.nix | 1 | ||||
-rw-r--r-- | pkgs/development/libraries/glib/default.nix | 1 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/androidndk.nix | 2 | ||||
-rw-r--r-- | pkgs/development/mobile/androidenv/androidndk_r8e.nix | 2 | ||||
-rw-r--r-- | pkgs/development/mobile/flashtool/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/iaca/2.1.nix | 1 | ||||
-rw-r--r-- | pkgs/development/tools/iaca/3.0.nix | 1 | ||||
-rw-r--r-- | pkgs/development/tools/misc/saleae-logic/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/phantomjs/default.nix | 1 |
9 files changed, 2 insertions, 15 deletions
diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix index 642c17dc6d3f..b93a13abc9ca 100644 --- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix @@ -25,7 +25,6 @@ , setJavaClassPath }: -assert stdenv.system == "x86_64-linux"; assert swingSupport -> xorg != null; let diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index d2dc9a8c637b..403f0e8aa995 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -9,7 +9,6 @@ with stdenv.lib; -assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU || hostPlatform.isCygwin; assert stdenv.isLinux -> utillinuxMinimal != null; # TODO: diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 81ec5732b9a2..2fe4005532d4 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -3,8 +3,6 @@ , platformTools }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "android-ndk-r10e"; diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 271a18e4ee06..3b5da19da9e1 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -3,8 +3,6 @@ , platformTools }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { name = "android-ndk-r8e"; diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index be4fc0f7f545..601b0b319bc8 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -1,7 +1,5 @@ { stdenv, requireFile, p7zip, jre, libusb1, platformTools, gtk2, glib, libXtst }: -assert stdenv.system == "i686-linux"; - # TODO: # # The FlashTool and FlashToolConsole scripts are messy and should probably we @@ -57,7 +55,7 @@ stdenv.mkDerivation rec { homepage = http://www.flashtool.net/; description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra"; license = stdenv.lib.licenses.unfreeRedistributableFirmware; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" ]; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }; diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index c434fd5a7dec..e71e296212cd 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -1,5 +1,4 @@ { stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }: -assert stdenv.system == "x86_64-linux"; with stdenv.lib; # v2.1: last version with NHM/WSM arch support diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix index 025dfc56721d..af738bc71a93 100644 --- a/pkgs/development/tools/iaca/3.0.nix +++ b/pkgs/development/tools/iaca/3.0.nix @@ -1,5 +1,4 @@ { stdenv, requireFile, patchelf, unzip }: -assert stdenv.system == "x86_64-linux"; with stdenv.lib; stdenv.mkDerivation { diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index de2d6c5b7bfd..a8183aa4ba08 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -21,8 +21,6 @@ let in -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - stdenv.mkDerivation rec { pname = "saleae-logic"; version = "1.2.10"; @@ -93,7 +91,7 @@ stdenv.mkDerivation rec { description = "Software for Saleae logic analyzers"; homepage = http://www.saleae.com/; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 8b6b655b6a56..51a83760be39 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -3,7 +3,6 @@ let platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; in -assert lib.elem stdenv.system platforms; stdenv.mkDerivation rec { name = "phantomjs-1.9.8"; |