nur-packages

commit dad985af05563952ec5f85c2b631442b228d5045
parent 104e7547dfae03be7f8c215c71bbe3021cc77447
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Thu, 24 Sep 2020 00:11:30 +0300

Cleanup

Diffstat:
M
pkgs/applications/gpxsee/default.nix
 | 
1
-
M
pkgs/data/dicts/huzheng/base.nix
 | 
11
++++-------
M
pkgs/data/dicts/wiktionary/base.nix
 | 
10
++++------
M
pkgs/data/maps/dem/default.nix
 | 
8
++++----

4 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/pkgs/applications/gpxsee/default.nix b/pkgs/applications/gpxsee/default.nix
@@ -50,6 +50,5 @@ mkDerivation {
     license = licenses.gpl3;
     maintainers = [ maintainers.sikmir ];
     platforms = platforms.unix;
-    skip.ci = stdenv.isDarwin;
   };
 }
diff --git a/pkgs/data/dicts/huzheng/base.nix b/pkgs/data/dicts/huzheng/base.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pname, version, filename, sha256, description }:
+{ stdenvNoCC, fetchurl, pname, version, filename, sha256, description }:
 
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   inherit pname version;
 
   src = fetchurl {
@@ -8,14 +8,11 @@ stdenv.mkDerivation {
     inherit sha256;
   };
 
-  installPhase = ''
-    install -dm755 $out/share/goldendict/dictionaries/${pname}
-    cp -a . $out/share/goldendict/dictionaries/${pname}
-  '';
+  installPhase = "cp -a . $out";
 
   preferLocalBuild = true;
 
-  meta = with stdenv.lib; {
+  meta = with stdenvNoCC.lib; {
     inherit description;
     homepage = "http://download.huzheng.org/bigdict/";
     license = licenses.free;
diff --git a/pkgs/data/dicts/wiktionary/base.nix b/pkgs/data/dicts/wiktionary/base.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, lang, version, sha256 }:
+{ stdenvNoCC, fetchurl, lang, version, sha256 }:
 
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "wiktionary-${lang}";
   inherit version;
 
@@ -9,13 +9,11 @@ stdenv.mkDerivation {
     inherit sha256;
   };
 
-  installPhase = ''
-    install -Dm644 *.{dict,idx,ifo} -t $out/share/goldendict/dictionaries/wiktionary
-  '';
+  installPhase = "install -Dm644 *.{dict,idx,ifo} -t $out";
 
   preferLocalBuild = true;
 
-  meta = with stdenv.lib; {
+  meta = with stdenvNoCC.lib; {
     description = "Wiktionary dictionaries for StarDict (${lang})";
     homepage = "http://libredict.org/en/info_${lang}.html";
     license = licenses.free;
diff --git a/pkgs/data/maps/dem/default.nix b/pkgs/data/maps/dem/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, unzip, gdal }:
+{ stdenvNoCC, lib, fetchurl, unzip, gdal }:
 let
   dem1 = builtins.fromJSON (builtins.readFile ./dem1.json);
 in
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "dem";
   version = "2014-05-25";
 
-  srcs = stdenv.lib.mapAttrsToList (name: spec: fetchurl spec) dem1;
+  srcs = lib.mapAttrsToList (name: spec: fetchurl spec) dem1;
 
   unpackPhase = "for src in $srcs; do ${unzip}/bin/unzip $src; done";
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     ${gdal}/bin/gdalbuildvrt $out/SRTM.vrt $out/*.hgt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Digital Elevation Data";
     homepage = "http://www.viewfinderpanoramas.org/";
     license = licenses.free;