diff options
author | Jaka Hudoklin <offlinehacker@users.noreply.github.com> | 2017-05-25 01:10:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-25 01:10:52 +0200 |
commit | e6025373210f5a1688bac4a3ab12d8f85cc5e7da (patch) | |
tree | 263cfe2e642da810d6e71e153be5e445f3deaafa /pkgs | |
parent | 87262e6196f23baa7930afaa401c7ed040533d47 (diff) | |
parent | d4372617d02ed3ff6bdea310674367b1c8514324 (diff) | |
download | nixlib-e6025373210f5a1688bac4a3ab12d8f85cc5e7da.tar nixlib-e6025373210f5a1688bac4a3ab12d8f85cc5e7da.tar.gz nixlib-e6025373210f5a1688bac4a3ab12d8f85cc5e7da.tar.bz2 nixlib-e6025373210f5a1688bac4a3ab12d8f85cc5e7da.tar.lz nixlib-e6025373210f5a1688bac4a3ab12d8f85cc5e7da.tar.xz nixlib-e6025373210f5a1688bac4a3ab12d8f85cc5e7da.tar.zst nixlib-e6025373210f5a1688bac4a3ab12d8f85cc5e7da.zip |
Merge pull request #26074 from proteansec/pkgs/loadlibrary
loadlibrary: init at 2551be
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/misc/loadlibrary/default.nix | 31 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 35 insertions, 2 deletions
diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix new file mode 100644 index 000000000000..6ebf86b06fa4 --- /dev/null +++ b/pkgs/tools/misc/loadlibrary/default.nix @@ -0,0 +1,31 @@ +{ cabextract, glibc_multi, fetchFromGitHub, readline, stdenv_32bit }: + +# stdenv_32bit is needed because the program depends upon 32-bit libraries and does not have +# support for 64-bit yet: it requires libc6-dev:i386, libreadline-dev:i386. + +stdenv_32bit.mkDerivation rec { + name = "loadlibrary-${version}"; + version = "20170525-${stdenv_32bit.lib.strings.substring 0 7 rev}"; + rev = "721b084c088d779075405b7f20c77c2578e2a961"; + src = fetchFromGitHub { + inherit rev; + owner = "taviso"; + repo = "loadlibrary"; + sha256 = "01hb7wzfh1s5b8cvmrmr1gqknpq5zpzj9prq3wrpsgg129jpsjkb"; + }; + + buildInputs = [ glibc_multi cabextract readline stdenv_32bit.cc.libc ]; + + installPhase = '' + mkdir -p $out/bin/ + cp mpclient $out/bin/ + ''; + + meta = with stdenv_32bit.lib; { + homepage = "https://github.com/taviso/loadlibrary"; + description = "Porting Windows Dynamic Link Libraries to Linux"; + platforms = platforms.linux; + maintainers = [ maintainers.eleanor ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index faa2d2db948f..cc71f918d541 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2653,6 +2653,8 @@ with pkgs; lnav = callPackage ../tools/misc/lnav { }; + loadlibrary = callPackage ../tools/misc/loadlibrary { }; + loc = callPackage ../development/misc/loc { }; lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; @@ -13355,7 +13357,7 @@ with pkgs; clipit = callPackage ../applications/misc/clipit { }; cloud-print-connector = callPackage ../servers/cloud-print-connector { }; - + cmatrix = callPackage ../applications/misc/cmatrix { }; cmus = callPackage ../applications/audio/cmus { @@ -17791,7 +17793,7 @@ with pkgs; coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5; coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6; coqPackages = coqPackages_8_6; - + coq_8_4 = coqPackages_8_4.coq; coq_8_5 = coqPackages_8_5.coq; coq_8_6 = coqPackages_8_6.coq; |