diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-14 17:50:16 +0000 |
| commit | 439ebf093f2779d73bc76484a36be2889cc807bf (patch) | |
| tree | 7dd3b84fb345c228165c2dae6c7cdd54b433db9e /nixpkgs/pkgs/tools/package-management | |
| parent | d7417c2c1096b13fe903af802c7cf019fca14a7b (diff) | |
| parent | 0c0954781e257b8b0dc49341795a2fe7d96945a3 (diff) | |
| download | nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.gz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.bz2 nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.lz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.xz nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.tar.zst nixlib-439ebf093f2779d73bc76484a36be2889cc807bf.zip | |
Merge commit '0c0954781e257b8b0dc49341795a2fe7d96945a3'
Diffstat (limited to 'nixpkgs/pkgs/tools/package-management')
| -rw-r--r-- | nixpkgs/pkgs/tools/package-management/appimagekit/default.nix | 20 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/package-management/nix-review/default.nix | 4 |
2 files changed, 18 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix index 2c389c144b1e..b4b339edb5f7 100644 --- a/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub -, pkgconfig, cmake, autoconf, automake, libtool -, wget, xxd, desktop-file-utils -, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive +, pkgconfig, cmake, autoconf, automake, libtool, makeWrapper +, wget, xxd, desktop-file-utils, file +, gnupg, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive , squashfsTools , gtest }: @@ -72,9 +72,13 @@ in stdenv.mkDerivation rec { buildInputs = [ glib zlib cairo openssl fuse xz inotify-tools libarchive - squashfsTools + squashfsTools makeWrapper ]; + postPatch = '' + substituteInPlace src/appimagetool.c --replace "/usr/bin/file" "${file}/bin/file" + ''; + preConfigure = '' export HOME=$(pwd) ''; @@ -90,6 +94,14 @@ in stdenv.mkDerivation rec { "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}" ]; + postInstall = '' + cp "${squashfsTools}/bin/mksquashfs" "$out/lib/appimagekit/" + cp "${desktop-file-utils}/bin/desktop-file-validate" "$out/bin" + + wrapProgram "$out/bin/appimagetool" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ file gnupg ]}" + ''; + checkInputs = [ gtest ]; doCheck = false; # fails 1 out of 4 tests, I'm too lazy to debug why diff --git a/nixpkgs/pkgs/tools/package-management/nix-review/default.nix b/nixpkgs/pkgs/tools/package-management/nix-review/default.nix index a57056569c08..367405f552fb 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-review/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "1.0.5"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "13dv2zpnhf218hfmixsgsbvy9zgrp7b0d125hvq8sk5x57f6114q"; + sha256 = "1hichipf02yz9n2n1fnky5rm9wxwcd04xlr0y05y78ixw8xb5ah0"; }; makeWrapperArgs = [ |