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

2016-07-19 10:37:02 +00:00
parent 6539901c7f b54009fdfb
commit 203846b9de
282 changed files with 4189 additions and 7149 deletions
@@ -9,8 +9,18 @@ stdenv.mkDerivation rec {
    sha256 = "181qnknq1j5x075icpw2qk0sc4wcj9f2hym533vs936is0wxp2gk";
  };

+  unpackPhase = ''
+    tar xjf ${src}
+  '';
+
  buildInputs = [ qtbase qtsvg boost qmakeHook ];

+  qmakeFlags = [ "phoenix.pro" ];
+
+  preConfigure = ''
+    cd fritzing-${version}.source
+  '';
+  
  meta = {
    description = "An open source prototyping tool for Arduino-based projects";
    homepage = http://fritzing.org/;