diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-06-07 21:27:25 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-06-07 21:27:25 +0000 |
| commit | 42c246ec16b07fbecbb87922669920500602c735 (patch) | |
| tree | 2a971c56ca8d929d0288d921838b4cb72e86bdfe /pkgs | |
| parent | 5990a432d45e804c95428c24e45c425428426d98 (diff) | |
| download | nixlib-42c246ec16b07fbecbb87922669920500602c735.tar nixlib-42c246ec16b07fbecbb87922669920500602c735.tar.gz nixlib-42c246ec16b07fbecbb87922669920500602c735.tar.bz2 nixlib-42c246ec16b07fbecbb87922669920500602c735.tar.lz nixlib-42c246ec16b07fbecbb87922669920500602c735.tar.xz nixlib-42c246ec16b07fbecbb87922669920500602c735.tar.zst nixlib-42c246ec16b07fbecbb87922669920500602c735.zip | |
* Eject 2.1.5.
svn path=/nixpkgs/trunk/; revision=8843
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 |
3 files changed, 7 insertions, 33 deletions
diff --git a/pkgs/os-specific/linux/eject/builder.sh b/pkgs/os-specific/linux/eject/builder.sh deleted file mode 100644 index 8b16223a3497..000000000000 --- a/pkgs/os-specific/linux/eject/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -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 index 5a5b0006f977..eec1ec5342c0 100644 --- a/pkgs/os-specific/linux/eject/default.nix +++ b/pkgs/os-specific/linux/eject/default.nix @@ -1,13 +1,14 @@ {stdenv, fetchurl, gettext}: stdenv.mkDerivation { - name = "eject-2.1.0"; - builder = ./builder.sh; + name = "eject-2.1.5"; + #builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/eject-2.1.0.tar.gz; - md5 = "82e3a7a4d7e3323018c6938015ff25f7"; + url = http://ca.geocities.com/jefftranter@rogers.com/eject-2.1.5.tar.gz; + sha256 = "0mgy5wp40rsalfkxs6mvsg3s7yaqf2iq49iv4axf9zac9037k7zg"; }; buildInputs = [gettext]; - NIX_DEBUG=1; - patches = [./eject-destdir.patch]; + preBuild = " + makeFlagsArray=(PREFIX=$out) + "; } diff --git a/pkgs/os-specific/linux/eject/eject-destdir.patch b/pkgs/os-specific/linux/eject/eject-destdir.patch deleted file mode 100644 index 85abc097fbee..000000000000 --- a/pkgs/os-specific/linux/eject/eject-destdir.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 |