Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-03 13:34:44 +00:00
parent 3f9e8601f2 d93f917182
commit 1b979d8384
1099 changed files with 2664 additions and 513 deletions
@@ -20,11 +20,12 @@ stdenv.mkDerivation rec {
  preConfigure = ''
    cd fritzing-${version}.source
  '';
-  
+
  meta = {
    description = "An open source prototyping tool for Arduino-based projects";
    homepage = http://fritzing.org/;
    license = stdenv.lib.licenses.gpl3;
    maintainers = [ stdenv.lib.maintainers.robberer ];
-  }; 
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
    description = "Graphical editor for finite state machines";
    homepage = "http://qfsm.sourceforge.net/";
    license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.unix;
  };
 }