diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/eject/builder.sh | 5 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/eject/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/eject/eject-destdir.patch | 22 | ||||
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 8 |
4 files changed, 48 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/eject/builder.sh b/pkgs/os-specific/linux/eject/builder.sh new file mode 100644 index 0000000000000..8b16223a34978 --- /dev/null +++ b/pkgs/os-specific/linux/eject/builder.sh @@ -0,0 +1,5 @@ +source $stdenv/setup + +export destdir=$out + +genericBuild diff --git a/pkgs/os-specific/linux/eject/default.nix b/pkgs/os-specific/linux/eject/default.nix new file mode 100644 index 0000000000000..8d20d90758bf1 --- /dev/null +++ b/pkgs/os-specific/linux/eject/default.nix @@ -0,0 +1,13 @@ +{stdenv, fetchurl, gettext}: + +stdenv.mkDerivation { + name = "eject-2.1.0"; + builder = ./builder.sh; + src = fetchurl { + url = http://www.ibiblio.org/pub/Linux/utils/disk-management/eject-2.1.0.tar.gz; + md5 = "82e3a7a4d7e3323018c6938015ff25f7"; + }; + buildInputs = [gettext]; + NIX_DEBUG=1; + patches = [./eject-destdir.patch]; +} diff --git a/pkgs/os-specific/linux/eject/eject-destdir.patch b/pkgs/os-specific/linux/eject/eject-destdir.patch new file mode 100644 index 0000000000000..85abc097fbee1 --- /dev/null +++ b/pkgs/os-specific/linux/eject/eject-destdir.patch @@ -0,0 +1,22 @@ +diff -ruN eject-2.1.0/Makefile.in eject-2.1.0.new/Makefile.in +--- eject-2.1.0/Makefile.in 2002-12-09 23:38:08.000000000 +0100 ++++ eject-2.1.0.new/Makefile.in 2005-09-01 18:36:41.000000000 +0200 +@@ -67,7 +67,7 @@ + eject_SOURCES = eject.c + volname_SOURCES = volname.c + +-SUBDIRS = po ++#SUBDIRS = po + + AM_CPPFLAGS = -I/usr/src/linux -I/usr/src/linux/include -DDEFAULTDEVICE=\"$(DEFAULTDEVICE)\" -DGETOPTLONG + AM_CFLAGS = -Wall -O3 $(RPM_OPT_FLAGS) +diff -ruN eject-2.1.0/po/Makefile eject-2.1.0.new/po/Makefile +--- eject-2.1.0/po/Makefile 2005-05-01 20:41:17.000000000 +0200 ++++ eject-2.1.0.new/po/Makefile 2005-09-01 18:27:43.000000000 +0200 +@@ -1,5 +1,5 @@ + PKGNAME=eject +-PREFIX=$(DESTDIR)/usr ++PREFIX=$(prefix)/usr + INSTALL = install + MODIR = $(PREFIX)/share/locale + POTFILES = ../*.c ../*.h diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 163fcd12a1251..2c8e630c77491 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -168,6 +168,10 @@ rec { inherit fetchurl stdenv zlib; }; + curiDiet = (import ../tools/networking/curl-diet) { + inherit fetchurl stdenv zlib dietgcc; + }; + par2cmdline = (import ../tools/networking/par2cmdline) { inherit fetchurl stdenv; }; @@ -1125,6 +1129,10 @@ rec { gcc = stdenv.gcc; }; + eject = (import ../os-specific/linux/eject) { + inherit fetchurl stdenv gettext; + }; + hwdata = (import ../os-specific/linux/hwdata) { inherit fetchurl stdenv; }; |