Merge branch 'master' into staging-next

2019-09-04 11:00:56 +02:00
parent 2c5835b09a 1d8a3973f4
commit 4aad2947f8
217 changed files with 7332 additions and 2071 deletions
@@ -36,9 +36,6 @@ let
        qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine
      ];

-    doConfigure = false;
-    doBuild = false;
-
    installPhase = ''
      # Extract eagle tarball
      mkdir "$out"
@@ -16,7 +16,7 @@ stdenv.mkDerivation {

  # This uses '/bin/bash', '/usr/local' and 'lex' by default
  makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
    "LEX=flex"
    "RGBDEF=${netpbm}/share/netpbm/misc/rgb.txt"
  ];