diff options
| author | lassulus <lassulus@lassul.us> | 2017-08-21 14:21:56 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-08-21 14:21:56 +0200 |
| commit | 3c98ddcb67f698001b8aca5523512c98ef3d2458 (patch) | |
| tree | 34597aa4607a766f2c3f06e21a276c6c60fbe41f /makefu | |
| parent | 6a9e241df642e5b6b21d264719c52b29d577ff42 (diff) | |
| parent | d94f85a18cdcece49e3b95542567d8b1023f0da1 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/5pkgs/custom/inkscape/dxf_fix.patch | 13 | ||||
| -rw-r--r-- | makefu/5pkgs/default.nix | 3 |
2 files changed, 16 insertions, 0 deletions
diff --git a/makefu/5pkgs/custom/inkscape/dxf_fix.patch b/makefu/5pkgs/custom/inkscape/dxf_fix.patch new file mode 100644 index 000000000..5ea0a073e --- /dev/null +++ b/makefu/5pkgs/custom/inkscape/dxf_fix.patch @@ -0,0 +1,13 @@ +--- ./share/extensions/dxf_outlines.py 2017-02-14 00:46:57.000000000 +0100 ++++ ./share/extensions/dxf_outlines.py.new 2017-05-10 04:15:03.000000000 +0200 +@@ -340,7 +340,7 @@ + scale = eval(self.options.units) + if not scale: + scale = 25.4/96 # if no scale is specified, assume inch as baseunit +- h = self.unittouu(self.document.getroot().xpath('@height', namespaces=inkex.NSS)[0]) ++ h = self.unittouu(self.getDocumentHeight()) + self.groupmat = [[[scale, 0.0, 0.0], [0.0, -scale, h*scale]]] + doc = self.document.getroot() + self.process_group(doc) + + diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index 6070fc096..96975e54f 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -26,6 +26,9 @@ in { qcma = super.pkgs.libsForQt5.callPackage ./custom/qcma { }; inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client; nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {}; + inkscape = super.pkgs.stdenv.lib.overrideDerivation super.inkscape (old: { + patches = [ ./custom/inkscape/dxf_fix.patch ]; + }); pwqgen-ger = callPackage <stockholm/krebs/5pkgs/simple/passwdqc-utils> { wordset-file = super.pkgs.fetchurl { url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ; |