diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-10-05 19:02:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-10-05 19:02:48 +0200 |
| commit | 30f551d8b25782611f869369e54539efe745f5ea (patch) | |
| tree | 73187d1c515078f33bfdaa5088ac41dc3f1ea2ce /pkgs/development/tools/misc | |
| parent | d067b7bd3502a64b852ad8511502ed35d20cbc1b (diff) | |
| parent | 529a4050cdaf0f659534c2ba2d2565c43735ceb8 (diff) | |
| download | nixlib-30f551d8b25782611f869369e54539efe745f5ea.tar nixlib-30f551d8b25782611f869369e54539efe745f5ea.tar.gz nixlib-30f551d8b25782611f869369e54539efe745f5ea.tar.bz2 nixlib-30f551d8b25782611f869369e54539efe745f5ea.tar.lz nixlib-30f551d8b25782611f869369e54539efe745f5ea.tar.xz nixlib-30f551d8b25782611f869369e54539efe745f5ea.tar.zst nixlib-30f551d8b25782611f869369e54539efe745f5ea.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/gpshell/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/trv/default.nix | 10 |
2 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index a4ed3a44f350..f552fe00566b 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite }: +{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin +, makeWrapper +}: stdenv.mkDerivation rec { name = "gpshell-${version}"; @@ -9,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; }; - buildInputs = [ pkgconfig globalplatform pcsclite ]; + buildInputs = [ pkgconfig globalplatform pcsclite makeWrapper ]; + + postFixup = '' + wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib" + ''; meta = with stdenv.lib; { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index c14a41cc5599..4b83c12bed77 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -2,15 +2,11 @@ , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find , cohttp, uri, tzdata}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.1.3"; -in - -assert stdenv.lib.versionOlder "4.02" ocaml_version; +assert stdenv.lib.versionOlder "4.02" ocaml.version; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "trv-${version}"; + version = "0.1.3"; src = fetchFromGitHub { owner = "afiniate"; |