diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-02-25 20:19:10 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-02-25 22:24:09 +0300 |
| commit | c336e5c872619beb34ec04bbbde8c7e617b7cf33 (patch) | |
| tree | 929f38f69ec5bfb3ca41a0cf1f95040bf330b7b6 | |
| parent | 86db477589872bf4a7ea5d932fdef7190684da8d (diff) | |
| download | nixpkgs-c336e5c872619beb34ec04bbbde8c7e617b7cf33.tar nixpkgs-c336e5c872619beb34ec04bbbde8c7e617b7cf33.tar.gz nixpkgs-c336e5c872619beb34ec04bbbde8c7e617b7cf33.tar.bz2 nixpkgs-c336e5c872619beb34ec04bbbde8c7e617b7cf33.tar.lz nixpkgs-c336e5c872619beb34ec04bbbde8c7e617b7cf33.tar.xz nixpkgs-c336e5c872619beb34ec04bbbde8c7e617b7cf33.tar.zst nixpkgs-c336e5c872619beb34ec04bbbde8c7e617b7cf33.zip | |
scfbuild: move to all-packages
It's not a library.
| -rw-r--r-- | pkgs/tools/misc/scfbuild/default.nix | 30 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 31 |
3 files changed, 32 insertions, 33 deletions
diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix new file mode 100644 index 00000000000..a310135727d --- /dev/null +++ b/pkgs/tools/misc/scfbuild/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonApplication, fetchFromGitHub, python, pyyaml, fonttools, fontforge }: + +buildPythonApplication rec { + name = "scfbuild-${version}"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "eosrei"; + repo = "scfbuild"; + rev = "c179c8d279b7cc0a9a3536a713ac880ac6010318"; + sha256 = "1bsi7k4kkj914pycp1g92050hjxscyvc9qflqb3cv5yz3c93cs46"; + }; + + phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; + + propagatedBuildInputs = [ pyyaml fonttools fontforge ]; + + installPhase = '' + mkdir -p $out/${python.sitePackages} + cp -r scfbuild $out/${python.sitePackages} + cp -r bin $out + ''; + + meta = with lib; { + description = "SVGinOT color font builder"; + homepage = https://github.com/eosrei/scfbuild; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6af75ddc5f9..9e1a5380c77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4626,6 +4626,8 @@ with pkgs; qtbase = qt4; qmake = qmake4Hook; }; + scfbuild = python2.pkgs.callPackage ../tools/misc/scfbuild { }; + scrot = callPackage ../tools/graphics/scrot { }; scrypt = callPackage ../tools/security/scrypt { }; @@ -14012,7 +14014,6 @@ with pkgs; emojione = callPackage ../data/fonts/emojione { inherit (nodePackages) svgo; - inherit (pythonPackages) scfbuild; }; encode-sans = callPackage ../data/fonts/encode-sans { }; @@ -14327,7 +14328,6 @@ with pkgs; twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { inherit (nodePackages) svgo; - inherit (pythonPackages) scfbuild; }; tzdata = callPackage ../data/misc/tzdata { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0a4a4798c7a..ac1e8295082 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6635,37 +6635,6 @@ in { }; }; - scfbuild = self.buildPythonPackage rec { - name = "scfbuild-${version}"; - version = "1.0.3"; - - disabled = isPy3k; - - src = pkgs.fetchFromGitHub { - owner = "eosrei"; - repo = "scfbuild"; - rev = "c179c8d279b7cc0a9a3536a713ac880ac6010318"; - sha256 = "1bsi7k4kkj914pycp1g92050hjxscyvc9qflqb3cv5yz3c93cs46"; - }; - - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; - - propagatedBuildInputs = with self; [ pyyaml fonttools fontforge ]; - - installPhase = '' - mkdir -p $out/${python.sitePackages} - cp -r scfbuild $out/${python.sitePackages} - cp -r bin $out - ''; - - meta = with stdenv.lib; { - description = "SVGinOT color font builder"; - homepage = "https://github.com/eosrei/scfbuild"; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - schedule = buildPythonPackage rec { name = "schedule-0.3.2"; |