From cce6dbd5579c8f7582e74781a803f7a307fc5f6d Mon Sep 17 00:00:00 2001 From: Christian Ulrich Date: Sun, 7 Feb 2021 15:56:55 +0100 Subject: [PATCH] remove freetz-tools (will be replaced by squashfs-avm-be) --- default.nix | 2 -- pkgs/freetz-tools/default.nix | 61 ----------------------------------- 2 files changed, 63 deletions(-) delete mode 100644 pkgs/freetz-tools/default.nix diff --git a/default.nix b/default.nix index 01ac836..dfb6226 100644 --- a/default.nix +++ b/default.nix @@ -7,8 +7,6 @@ self: super: c2nim = super.callPackage ./pkgs/nim-packages/c2nim.nix { }; - freetz-tools = super.callPackage ./pkgs/freetz-tools/default.nix { }; - gintro = super.callPackage ./pkgs/nim-packages/gintro/default.nix { }; gnutls = super.callPackage ./pkgs/gnutls/default.nix { diff --git a/pkgs/freetz-tools/default.nix b/pkgs/freetz-tools/default.nix deleted file mode 100644 index 2dfd3b6..0000000 --- a/pkgs/freetz-tools/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, pkgconfig, autoconf, automake, file, git, libtool, perl, python, - unzip, imagemagick, bash, which, glibc, gettext, bison, flex, ncurses, - readline, acl, zlib, libcap }: - -with stdenv.lib; - -let - ncursesInc = makeSearchPathOutput "dev" "include" [ ncurses ]; - zlibInc = makeSearchPathOutput "dev" "include" [ zlib ]; - readlineInc = makeSearchPathOutput "dev" "include" [ readline ]; - aclInc = makeSearchPathOutput "dev" "include" [ acl ]; - libcapInc = makeSearchPathOutput "dev" "include" [ libcap ]; -in -stdenv.mkDerivation rec { - name = "freetz-tools"; - version = "0.1"; - - src = /home/christian/Downloads/Openwrt-Router/freetz; - - patchPhase = '' - patchShebangs tools - - substituteInPlace tools/check_prerequisites \ - --replace "/sbin/ldconfig" "${glibc}/bin/ldconfig" \ - --replace "/usr/include/ /usr/local/include/" "${ncursesInc} \ - ${zlibInc} \ - ${readlineInc} \ - ${aclInc} \ - ${libcapInc}" - ''; - - buildInputs = [ - which - autoconf - automake - file - git - libtool - perl - python - unzip - imagemagick - gettext - pkgconfig - bison - flex - ncurses - readline - ]; - - buildPhase = '' - make tools - ''; - - installPhase = '' - install -D tools/unsquashfs4-avm-be $out/bin/unsquashfs4-avm-be - install -D tools/unsquashfs4-avm-le $out/bin/unsquashfs4-avm-le - install -D tools/mksquashfs4-avm-be $out/bin/mksquashfs4-avm-be - install -D tools/mksquashfs4-avm-le $out/bin/mksquashfs4-avm-le - ''; -}