Skip to content

Commit

Permalink
Merge pull request #74518 from andir/chirp
Browse files Browse the repository at this point in the history
chirp: modernize the expression by using buildPythonApplication
  • Loading branch information
andir committed Dec 12, 2019
2 parents c676063 + f9dd4b2 commit b5de0c5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 23 deletions.
29 changes: 9 additions & 20 deletions pkgs/applications/radio/chirp/default.nix
@@ -1,31 +1,20 @@
{ stdenv, fetchurl, libxml2Python, libxslt, makeWrapper
, pyserial, pygtk }:

stdenv.mkDerivation rec {
{ stdenv
, fetchurl
, python2
}:
python2.pkgs.buildPythonApplication rec {
pname = "chirp-daily";
version = "20190925";
version = "20191123";

src = fetchurl {
url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz";
sha256 = "0immgss7nj7395r3csiypksnbn1r2f3j45c5v8qpybz65lpbplps";
sha256 = "11wzk0c9fa3gp185gyd47g3sh7gfallw7qapr6qp913q2zfmif8v";
};

nativeBuildInputs = [ makeWrapper ];
buildInputs = [
pyserial pygtk libxml2Python libxslt
propagatedBuildInputs = with python2.pkgs; [
pygtk pyserial libxml2
];

installPhase = ''
mkdir -p $out/bin $out/share/chirp
cp -r . $out/share/chirp/
ln -s $out/share/chirp/chirpw $out/bin/chirpw
for file in "$out"/bin/*; do
wrapProgram "$file" \
--prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out")
done
'';

meta = with stdenv.lib; {
description = "A free, open-source tool for programming your amateur radio";
homepage = https://chirp.danplanet.com/;
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -18177,9 +18177,7 @@ in

cgminer = callPackage ../applications/misc/cgminer { };

chirp = callPackage ../applications/radio/chirp {
inherit (pythonPackages) pyserial pygtk;
};
chirp = callPackage ../applications/radio/chirp { };

browsh = callPackage ../applications/networking/browsers/browsh { };

Expand Down

0 comments on commit b5de0c5

Please sign in to comment.