From bded592a8ef7a3e9ab1940aeceb613b078ea9a7e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 1 Aug 2017 06:23:57 -0500 Subject: [PATCH] Revert "otfcc: init at 0.8.6" This reverts commit f3a54b014ce9cc3bbf2a65ab88291cbc3e3701b6. --- pkgs/tools/misc/otfcc/default.nix | 40 ------------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 42 deletions(-) delete mode 100644 pkgs/tools/misc/otfcc/default.nix diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix deleted file mode 100644 index ac64978bdd1a..000000000000 --- a/pkgs/tools/misc/otfcc/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, premake5 }: - -let version = "0.8.6"; in - -let - arch = - { - "i686-linux" = "x86"; - "x86_64-linux" = "x64"; - }.${stdenv.system} or (throw "platform ${stdenv.system} is not supported"); -in - -stdenv.mkDerivation { - name = "otfcc-${version}"; - src = fetchurl { - url = "https://github.com/caryll/otfcc/archive/v${version}.tar.gz"; - sha256 = "0kap52bzrn21fmph8j2pc71f80f38ak1p2fcczzmrh0hb1r9c8dd"; - }; - nativeBuildInputs = [ premake5 ]; - configurePhase = '' - runHook preConfigure - premake5 gmake - runHook postConfigure - ''; - buildPhase = '' - runHook preBuild - cd build/gmake - make config=release_${arch} - cd ../.. - runHook postBuild - ''; - installPhase = '' - runHook preInstall - install -d "$out/lib" - install "bin/release-${arch}/"lib* "$out/lib" - install -d "$out/bin" - install "bin/release-${arch}/"otfcc* "$out/bin" - runHook postInstall - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 173067331369..21ee6afaf24c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3586,8 +3586,6 @@ with pkgs; ostree = callPackage ../tools/misc/ostree { }; - otfcc = callPackage ../tools/misc/otfcc {}; - otpw = callPackage ../os-specific/linux/otpw { }; owncloud = owncloud70;