diff options
| author | makefu <github@syntax-fehler.de> | 2018-09-17 01:11:57 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-09-17 01:13:40 +0200 |
| commit | 0823d0cbdc2861defaabc232058d96c8862c0b24 (patch) | |
| tree | 6bb8d996de851b0d284c3123e3743d80cf647a89 /makefu/5pkgs | |
| parent | 80250950625cceb084ed4251082a01fbd8de2bc1 (diff) | |
ma: random cleanup
Diffstat (limited to 'makefu/5pkgs')
| -rw-r--r-- | makefu/5pkgs/bento4/default.nix | 3 | ||||
| -rw-r--r-- | makefu/5pkgs/default.nix | 9 |
2 files changed, 1 insertions, 11 deletions
diff --git a/makefu/5pkgs/bento4/default.nix b/makefu/5pkgs/bento4/default.nix index 07c64a10..6f5f1deb 100644 --- a/makefu/5pkgs/bento4/default.nix +++ b/makefu/5pkgs/bento4/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchFromGitHub -, pkgconfig , cmake }: stdenv.mkDerivation rec { @@ -13,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1cq6vhrq3n3lc1n454slbc66qdyqam2srxgdhfpyfxbq5c4y06nf"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake ]; installPhase = '' mkdir -p $out/{lib,bin} find -iname '*.so' -exec mv --target-directory="$out/lib" {} \; diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index d1aec70c..390aabd7 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -33,15 +33,6 @@ in { 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 { - urls = [ - https://gist.githubusercontent.com/makefu/b56f5554c9ef03fe6e09878962e6fd8d/raw/1f147efec51325bc9f80c823bad8381d5b7252f6/wordset_4k.c - https://archive.org/download/nixos-stockholm-tarballs/pviar5j1gxiqcf3l34b4n2pil06xc8zf-wordset_4k.c - ]; - sha256 = "18ddzyh11bywrhzdkzvrl7nvgp5gdb4k1s0zxbz2bkhd14vi72bb"; - }; - }; } // (mapAttrs (_: flip callPackage {}) |