From ba1b5fe28cf3282fd6b6323863cb84dc92c91a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 22 Mar 2009 13:36:19 +0000 Subject: [PATCH] Removing the just added pdflrf. It violates the GPL. svn path=/nixpkgs/trunk/; revision=14647 --- pkgs/tools/graphics/pdflrf/default.nix | 40 -------------------------- pkgs/top-level/all-packages.nix | 5 ---- 2 files changed, 45 deletions(-) delete mode 100644 pkgs/tools/graphics/pdflrf/default.nix diff --git a/pkgs/tools/graphics/pdflrf/default.nix b/pkgs/tools/graphics/pdflrf/default.nix deleted file mode 100644 index 84db0653283b..000000000000 --- a/pkgs/tools/graphics/pdflrf/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, expat, freetype, fontconfig, libstdcpp5}: - -stdenv.mkDerivation ( rec { - name = "pdflrf-0.99"; - - src = fetchurl { - # I got it from http://www.mobileread.com/forums/showthread.php?t=13135 - # But that needs user registration to allow downloading. - # I unpacked the executable (upx) to allow patchelf to manage it - # Temporary place: - url = http://vicerveza.homeunix.net/~viric/soft/pdflrf-linux-0.99.bz2; - sha256 = "faf8c68b586d367e227581294a4dc22b2865291446d40b72d70b4dd53f7088d4"; - }; - - buildInputs = [ expat freetype fontconfig libstdcpp5 ]; - - phases = "unpackPhase patchPhase installPhase"; - - unpackPhase = "bunzip2 -c $src > pdflrf ; chmod +x pdflrf"; - - patchPhase = '' - set -x - fullPath= - for i in $buildInputs; do - fullPath=$fullPath:$i/lib - done - - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath $fullPath pdflrf - ''; - - installPhase = "ensureDir $out/bin; cp pdflrf $out/bin"; - - meta = { - description = "PDF to LRF converter (Sony Portable Reader System format)"; - homepage = http://www.mobileread.com/forums/showthread.php?t=13135; - # The program comes as binary-only, but free to use. - license = "free"; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a050235ecdd..ecea429abf80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1076,11 +1076,6 @@ let inherit fetchurl stdenv; }; - pdflrf = import ../tools/graphics/pdflrf { - inherit fetchurl stdenv expat freetype fontconfig; - libstdcpp5 = gcc33.gcc; - }; - pdsh = import ../tools/networking/pdsh { inherit fetchurl stdenv perl; readline = if getPkgConfig "pdsh" "readline" true then readline else null;