From 06a65dd592a62663b15547796b6f11fddb205b31 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 16 Aug 2017 12:03:32 +0200 Subject: ma 5pkgs: cleanup --- makefu/5pkgs/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'makefu/5pkgs/default.nix') diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index bb776ef25..6070fc096 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -20,13 +20,14 @@ self: super: let (filterAttrs (_: eq "directory") (readDir path)); in { - alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";}; - alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";}; - alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";}; + alsa-hdspconf = callPackage ./custom/alsa-tools { alsaToolTarget="hdspconf";}; + alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";}; + alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";}; + qcma = super.pkgs.libsForQt5.callPackage ./custom/qcma { }; inherit (callPackage ./devpi {}) devpi-web devpi-server devpi-client; - nodemcu-uploader = callPackage ./nodemcu-uploader {}; + nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {}; pwqgen-ger = callPackage { - wordset-file = pkgs.fetchurl { + wordset-file = super.pkgs.fetchurl { url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ; sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb"; }; -- cgit v1.2.3 From d94f85a18cdcece49e3b95542567d8b1023f0da1 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 16 Aug 2017 22:03:48 +0200 Subject: ma pkgs: init inkscape --- makefu/5pkgs/default.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'makefu/5pkgs/default.nix') 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 { wordset-file = super.pkgs.fetchurl { url = https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c ; -- cgit v1.2.3