diff options
| author | Bob van der Linden <bobvanderlinden@gmail.com> | 2015-04-20 13:55:04 +0200 |
|---|---|---|
| committer | Bob van der Linden <bobvanderlinden@gmail.com> | 2015-05-25 14:17:46 +0200 |
| commit | 2f4dc083d5d294392b9aaef59808466b4dad55c2 (patch) | |
| tree | 036601e2a2093ae96b94d43af78767139b429109 | |
| parent | 11a9774c75d4a000b3a987d5176f5da833e39403 (diff) | |
| download | nixlib-2f4dc083d5d294392b9aaef59808466b4dad55c2.tar nixlib-2f4dc083d5d294392b9aaef59808466b4dad55c2.tar.gz nixlib-2f4dc083d5d294392b9aaef59808466b4dad55c2.tar.bz2 nixlib-2f4dc083d5d294392b9aaef59808466b4dad55c2.tar.lz nixlib-2f4dc083d5d294392b9aaef59808466b4dad55c2.tar.xz nixlib-2f4dc083d5d294392b9aaef59808466b4dad55c2.tar.zst nixlib-2f4dc083d5d294392b9aaef59808466b4dad55c2.zip | |
added hwinfo
| -rw-r--r-- | pkgs/development/libraries/libx86emu/default.nix | 33 | ||||
| -rw-r--r-- | pkgs/tools/system/hwinfo/default.nix | 35 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 72 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix new file mode 100644 index 000000000000..a1471766516a --- /dev/null +++ b/pkgs/development/libraries/libx86emu/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "libx86emu-${version}"; + version = "1.5"; + + src = fetchurl { + url = "https://github.com/wfeldt/libx86emu/archive/${version}.tar.gz"; + sha256 = "1im6w6m0bl6ajynx4hc028lad8v10whv4y7w9zxndzh3j4mi3aa8"; + }; + + buildInputs = [ perl ]; + + patchPhase = '' + # VERSION is usually generated using Git + echo "${version}" > VERSION + sed -i 's|/usr/|/|g' Makefile + ''; + + makeFlags = "shared"; + + installPhase = '' + make install DESTDIR=$out/ LIBDIR=lib + ''; + + meta = with stdenv.lib; { + description = "x86 emulation library"; + license = licenses.bsd2; + homepage = https://github.com/wfeldt/libx86emu; + maintainers = with maintainers; [ bobvanderlinden ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix new file mode 100644 index 000000000000..6ecbbb98a546 --- /dev/null +++ b/pkgs/tools/system/hwinfo/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, libx86emu, flex, perl }: + +stdenv.mkDerivation rec { + name = "hwinfo-${version}"; + version = "21.12"; + + src = fetchurl { + url = "https://github.com/opensuse/hwinfo/archive/${version}.tar.gz"; + sha256 = "01y5jk2jns0a3mgsgmvmpvi5yyc0df7b3yqsg32hn5r2nv17i47p"; + }; + + patchPhase = '' + # VERSION and changelog is usually generated using Git + echo "${version}" > VERSION + sed -i 's|^\(TARGETS\s*=.*\)\<changelog\>\(.*\)$|\1\2|g' Makefile + + sed -i 's|lex isdn_cdb.lex|${flex}/bin/flex isdn_cdb.lex|g' src/isdn/cdb/Makefile + sed -i 's|/sbin|/bin|g' Makefile + sed -i 's|/usr/|/|g' Makefile + ''; + + installPhase = '' + make install DESTDIR=$out + ''; + + buildInputs = [ libx86emu flex perl ]; + + meta = with stdenv.lib; { + description = "Hardware detection tool from openSUSE"; + license = licenses.gpl2; + homepage = https://github.com/openSUSE/hwinfo; + maintainers = with maintainers; [ bobvanderlinden ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ee71adff23e..f6dd5891baab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1670,6 +1670,8 @@ let httptunnel = callPackage ../tools/networking/httptunnel { }; + hwinfo = callPackage ../tools/system/hwinfo { }; + i2p = callPackage ../tools/networking/i2p {}; i2pd = callPackage ../tools/networking/i2pd {}; @@ -1869,6 +1871,8 @@ let libxcomp = callPackage ../development/libraries/libxcomp { }; + libx86emu = callPackage ../development/libraries/libx86emu { }; + librdmacm = callPackage ../development/libraries/librdmacm { }; limesurvey = callPackage ../servers/limesurvey { }; |