summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-01-24 15:50:54 +0000
committerRobin Gloster <mail@glob.in>2016-01-30 20:31:03 +0000
commit1af99b8dad40ab1a33a75f0a3d83584408a57561 (patch)
tree307e278b0778a06678086d209375656e25f5ec89
parent96350a9ec943640c8567224d5aa000d1affe7a59 (diff)
downloadnixlib-1af99b8dad40ab1a33a75f0a3d83584408a57561.tar
nixlib-1af99b8dad40ab1a33a75f0a3d83584408a57561.tar.gz
nixlib-1af99b8dad40ab1a33a75f0a3d83584408a57561.tar.bz2
nixlib-1af99b8dad40ab1a33a75f0a3d83584408a57561.tar.lz
nixlib-1af99b8dad40ab1a33a75f0a3d83584408a57561.tar.xz
nixlib-1af99b8dad40ab1a33a75f0a3d83584408a57561.tar.zst
nixlib-1af99b8dad40ab1a33a75f0a3d83584408a57561.zip
arkpandora_ttf: use mkDerivation
-rw-r--r--pkgs/data/fonts/arkpandora/default.nix18
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix
index 189c066b13eb..55420e2d344e 100644
--- a/pkgs/data/fonts/arkpandora/default.nix
+++ b/pkgs/data/fonts/arkpandora/default.nix
@@ -1,6 +1,8 @@
-args : with args; 
-let version = lib.attrByPath ["version"] "2.04" args; in
-rec {
+{ stdenv, fetchurl }:
+stdenv.mkDerivation rec {
+  name = "arkpandora-${version}";
+  version = "2.04";
+
   src = fetchurl {
     urls = [
       "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz"
@@ -10,13 +12,11 @@ rec {
     sha256 = "16mfxwlgn6vs3xn00hha5dnmz6bhjiflq138y4zcq3yhk0y9bz51";
   };
 
-  buildInputs = [];
-  configureFlags = [];
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["doUnpack" "installFonts"];
-      
-  name = "arkpandora-" + version;
   meta = {
     description = "Font, metrically identical to Arial and Times New Roman";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26d8f61e4fdc..472b325055ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10820,7 +10820,7 @@ let
 
   anonymousPro = callPackage ../data/fonts/anonymous-pro { };
 
-  arkpandora_ttf = builderDefsPackage (callPackage ../data/fonts/arkpandora) { };
+  arkpandora_ttf = callPackage ../data/fonts/arkpandora { };
 
   aurulent-sans = callPackage ../data/fonts/aurulent-sans { };