diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-24 12:39:37 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-24 12:39:37 +0200 |
| commit | 6e4e7c5dc65a3d988437dc2fa73201b8964c8c60 (patch) | |
| tree | ac550eb4543e2c836f8b298972f26ad9cf093684 /pkgs/tools/filesystems | |
| parent | 7c62ef8685730fcdfbd544bbc5720bf18f13a5fd (diff) | |
| parent | c6f7545209676dfa6aef29c2a9c3687b6742e183 (diff) | |
| download | nixlib-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.tar nixlib-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.tar.gz nixlib-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.tar.bz2 nixlib-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.tar.lz nixlib-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.tar.xz nixlib-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.tar.zst nixlib-6e4e7c5dc65a3d988437dc2fa73201b8964c8c60.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/android-file-transfer/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/cpcfs/default.nix | 41 |
2 files changed, 50 insertions, 12 deletions
diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 6441ae5dbd1b..015408351fde 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -1,22 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }: +{ stdenv, fetchFromGitHub, cmake, fuse, readline, pkgconfig, qtbase }: stdenv.mkDerivation rec { - name = "android-file-transfer-${version}"; - version = "3.7"; + pname = "android-file-transfer"; + version = "3.8"; + src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "0a388pqc0azgn0wy85wb1mjk3b5zb6vcr58l4warwfzhca400zn0"; + sha256 = "0sym33a0ccdka2cpzv003n2xniid70z0gkjxx93gd2bajkgs9ggc"; }; - buildInputs = [ cmake fuse readline pkgconfig qtbase ]; - buildPhase = '' - cmake . - make - ''; - installPhase = '' - make install - ''; + + nativeBuildInputs = [ cmake readline pkgconfig ]; + buildInputs = [ fuse qtbase ]; + meta = with stdenv.lib; { description = "Reliable MTP client with minimalistic UI"; homepage = https://whoozle.github.io/android-file-transfer-linux/; diff --git a/pkgs/tools/filesystems/cpcfs/default.nix b/pkgs/tools/filesystems/cpcfs/default.nix new file mode 100644 index 000000000000..46635aa67412 --- /dev/null +++ b/pkgs/tools/filesystems/cpcfs/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, makeWrapper, ncurses, readline, ronn }: + +stdenv.mkDerivation rec { + + pname = "cpcfs"; + version = "0.85.4"; + + src = fetchFromGitHub { + owner = "derikz"; + repo = "cpcfs"; + rev = "v${version}"; + sha256 = "0rfbry0qy8mv746mzk9zdfffkdgq4w7invgb5cszjma2cp83q3i2"; + }; + + sourceRoot = "source/src"; + + nativeBuildInputs = [ makeWrapper ncurses readline ronn ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace '-ltermcap' '-lncurses' \ + --replace '-L /usr/lib/termcap' ' ' + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + mkdir -p $out/man/man1 + cp cpcfs $out/bin + ronn --roff ../template.doc --pipe > $out/man/man1/cpcfs.1 + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Manipulating CPC dsk images and files"; + homepage = "https://github.com/derikz/cpcfs/" ; + license = licenses.bsd2; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; + }; +} |