From 6d2fa7384d7af5c12924931a69d95a4ed7d12b59 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Mon, 1 Nov 2021 22:21:01 -0400 Subject: [PATCH] clean up package definitions --- pkgs/SpaceCadetPinball/default.nix | 2 ++ pkgs/binary-ninja-personal/default.nix | 2 ++ pkgs/default.nix | 24 ++++++++++++++---------- pkgs/packettracer/default.nix | 4 ++-- pkgs/security-toolbox/default.nix | 2 ++ 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/SpaceCadetPinball/default.nix b/pkgs/SpaceCadetPinball/default.nix index 631e2b0..c55b672 100644 --- a/pkgs/SpaceCadetPinball/default.nix +++ b/pkgs/SpaceCadetPinball/default.nix @@ -55,4 +55,6 @@ stdenv.mkDerivation rec { cp ${spacecadet_files}/* $out/share/${pname}/ ln -s $out/share/${pname}/SpaceCadetPinball $out/bin/SpaceCadetPinball ''; + + meta.platforms = [ "x86_64-linux" ]; } diff --git a/pkgs/binary-ninja-personal/default.nix b/pkgs/binary-ninja-personal/default.nix index b295c68..5a2b0b5 100644 --- a/pkgs/binary-ninja-personal/default.nix +++ b/pkgs/binary-ninja-personal/default.nix @@ -93,4 +93,6 @@ stdenv.mkDerivation rec { # Below is just a hack to keep the zip from being garbage-collected. ln -s "${src}" "$out/share/BinaryNinja-personal.zip" ''; + + meta.platforms = [ "x86_64-linux" ]; } diff --git a/pkgs/default.nix b/pkgs/default.nix index f17da5d..14ae3d7 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,17 +1,21 @@ pkgs: let empty = pkgs.runCommand "empty" { } "mkdir $out"; - x64 = x: if pkgs.system == "x86_64-linux" then x else empty; + pkg = path: args: + let + p = pkgs.callPackage path args; + in + if p.meta.available then p else empty; in rec { - binaryninja = x64 (pkgs.callPackage ./binary-ninja-personal { }); - commander-x16 = pkgs.callPackage ./commander-x16 { }; - gef = pkgs.callPackage ./gef { }; - packettracer = x64 (pkgs.callPackage ./packettracer { }); - security-toolbox = x64 (pkgs.callPackage ./security-toolbox { inherit gef webshells weevely; }); - SpaceCadetPinball = x64 (pkgs.callPackage ./SpaceCadetPinball { }); - stretchy-spaces = pkgs.callPackage ./stretchy-spaces { }; - webshells = pkgs.callPackage ./webshells { }; - weevely = pkgs.callPackage ./weevely { }; + binaryninja = pkg ./binary-ninja-personal { }; + commander-x16 = pkg ./commander-x16 { }; + gef = pkg ./gef { }; + packettracer = pkg ./packettracer { }; + security-toolbox = pkg ./security-toolbox { inherit gef webshells weevely; }; + SpaceCadetPinball = pkg ./SpaceCadetPinball { }; + stretchy-spaces = pkg ./stretchy-spaces { }; + webshells = pkg ./webshells { }; + weevely = pkg ./weevely { }; } diff --git a/pkgs/packettracer/default.nix b/pkgs/packettracer/default.nix index 56b4e4d..7a638bc 100644 --- a/pkgs/packettracer/default.nix +++ b/pkgs/packettracer/default.nix @@ -25,8 +25,6 @@ }: -assert stdenv.hostPlatform.system == "x86_64-linux"; - let version = "8.0.1"; @@ -108,4 +106,6 @@ buildFHSUserEnvBubblewrap { mkdir -p "$out/share/applications" cp "${desktopItem}"/share/applications/* "$out/share/applications/" ''; + + meta.platforms = [ "x86_64-linux" ]; } diff --git a/pkgs/security-toolbox/default.nix b/pkgs/security-toolbox/default.nix index 4f29ce0..0e2d31f 100644 --- a/pkgs/security-toolbox/default.nix +++ b/pkgs/security-toolbox/default.nix @@ -77,4 +77,6 @@ symlinkJoin { (burpsuite.overrideAttrs (_: { meta = { }; })) (postman.overrideAttrs (_: { meta = { }; })) ]; + + meta.platforms = [ "x86_64-linux" ]; }