nur-packages

commit 52a3df39a3f0c866e001e9b330859e389fddad77
parent 2e68658ca1a5a6c03e0477eaf44a6c02bf297b45
Author: Nikolay Korotkiy <sikmir@gmail.com>
Date:   Thu, 12 Nov 2020 09:49:24 +0300

Cleanup

Diffstat:
M
pkgs/applications/gis/qmapshack/bin.nix
 | 
11
+++++++----
M
pkgs/applications/macpass/bin.nix
 | 
12
+++++++-----
M
pkgs/applications/window-managers/amethyst/bin.nix
 | 
6
++++--
M
pkgs/data/maps/maptourist/default.nix
 | 
6
++++--
M
pkgs/data/maps/vlasenko-maps/default.nix
 | 
8
++++++--

5 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/pkgs/applications/gis/qmapshack/bin.nix b/pkgs/applications/gis/qmapshack/bin.nix
@@ -2,23 +2,26 @@
 let
   pname = "qmapshack";
   version = "1.15.0";
+  sha256 = "0dhl2km0xbv77xabjwdiv3y1psbjwjlyqs5222ji5d33wxl8m07n";
 in
 stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchfromgh {
     owner = "Maproom";
-    repo = "qmapshack";
+    repo = pname;
     version = "V_${version}";
     name = "QMapShack_OSX.${stdenv.appleSdkVersion}_${version}.zip";
-    sha256 = "0dhl2km0xbv77xabjwdiv3y1psbjwjlyqs5222ji5d33wxl8m07n";
+    inherit sha256;
   };
 
-  unpackPhase = "${unzip}/bin/unzip $src";
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ unzip ];
 
   installPhase = ''
     mkdir -p $out/Applications
-    cp -r QMapShack.app QMapTool.app $out/Applications
+    cp -r *.app $out/Applications
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/macpass/bin.nix b/pkgs/applications/macpass/bin.nix
@@ -1,24 +1,26 @@
 { stdenv, fetchfromgh, unzip }:
 let
+  pname = "MacPass";
   version = "0.7.12";
   sha256 = "1gikixbrz1pvyjspp62msdmhjdy1rfkx8jhy7rajjr8bzm8pzpmc";
 in
 stdenv.mkDerivation {
-  pname = "MacPass";
-  inherit version;
+  inherit pname version;
 
   src = fetchfromgh {
     owner = "MacPass";
-    repo = "MacPass";
+    repo = pname;
     name = "MacPass-${version}.zip";
     inherit version sha256;
   };
 
-  unpackPhase = "${unzip}/bin/unzip $src";
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ unzip ];
 
   installPhase = ''
     mkdir -p $out/Applications
-    cp -r MacPass.app $out/Applications
+    cp -r *.app $out/Applications
   '';
 
   preferLocalBuild = true;
diff --git a/pkgs/applications/window-managers/amethyst/bin.nix b/pkgs/applications/window-managers/amethyst/bin.nix
@@ -15,11 +15,13 @@ stdenv.mkDerivation {
     inherit sha256;
   };
 
-  unpackPhase = "${unzip}/bin/unzip $src";
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ unzip ];
 
   installPhase = ''
     mkdir -p $out/Applications
-    cp -r Amethyst.app $out/Applications
+    cp -r *.app $out/Applications
   '';
 
   preferLocalBuild = true;
diff --git a/pkgs/data/maps/maptourist/default.nix b/pkgs/data/maps/maptourist/default.nix
@@ -5,9 +5,11 @@ stdenvNoCC.mkDerivation {
   version = sources.maptourist.version;
   src = sources.maptourist;
 
-  dontUnpack = true;
+  sourceRoot = ".";
 
-  installPhase = "${unzip}/bin/unzip $src -d $out";
+  nativeBuildInputs = [ unzip ];
+
+  installPhase = "install -Dm644 *.img -t $out";
 
   preferLocalBuild = true;
 
diff --git a/pkgs/data/maps/vlasenko-maps/default.nix b/pkgs/data/maps/vlasenko-maps/default.nix
@@ -11,7 +11,9 @@
       name = "OV-Hib-Lov-${lib.replaceStrings [ "-" ] [ "" ] version}-1.03.zip";
     };
 
-    unpackPhase = "${unzip}/bin/unzip $src";
+    sourceRoot = ".";
+
+    nativeBuildInputs = [ unzip ];
 
     installPhase = "install -Dm644 *.img -t $out";
 
@@ -37,7 +39,9 @@
       name = "OV-Kamch-${lib.replaceStrings [ "-" ] [ "" ] version}-1.05.zip";
     };
 
-    unpackPhase = "${unzip}/bin/unzip $src";
+    sourceRoot = ".";
+
+    nativeBuildInputs = [ unzip ];
 
     installPhase = "install -Dm644 *.img -t $out";