diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-23 13:31:10 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-23 13:31:10 +0000 |
| commit | 7689a348c4eb7ed55bfaa273fadbb036f7f0bde7 (patch) | |
| tree | 8ebc0483e7a9f60f47c00f1cc09675cfcf2bc2f1 /pkgs/applications/misc/cdrtools | |
| parent | 0f10222e4ecee30837fe7631a37e343ccf82f49f (diff) | |
* Got rid of a lot of "postInstall=postInstall" and similar lines in
builders. These are redundant now. * Inlined some trivial builders. * Removed a few explicit setup-hook creations. This is done automatically now if setupHook is set. * Deleted the initscripts package. NixOS doesn't use it anymore. svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
Diffstat (limited to 'pkgs/applications/misc/cdrtools')
| -rw-r--r-- | pkgs/applications/misc/cdrtools/builder.sh | 11 | ||||
| -rw-r--r-- | pkgs/applications/misc/cdrtools/default.nix | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/applications/misc/cdrtools/builder.sh b/pkgs/applications/misc/cdrtools/builder.sh deleted file mode 100644 index 0e2afe0829984..0000000000000 --- a/pkgs/applications/misc/cdrtools/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -prefix=$out - -configurePhase() { - echo ; -} - -configurePhase=configurePhase - -genericBuild diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix index 271ed1a7ebb2e..94af2ee58f552 100644 --- a/pkgs/applications/misc/cdrtools/default.nix +++ b/pkgs/applications/misc/cdrtools/default.nix @@ -2,7 +2,9 @@ stdenv.mkDerivation { name = "cdrtools-2.01"; - builder = ./builder.sh; + + configurePhase = "prefix=$out"; + #hack, I'm getting "chown: invalid user: `bin" error, so replace chown by a nop dummy script preInstall = '' mkdir "$TMP/bin" @@ -12,10 +14,12 @@ stdenv.mkDerivation { PATH="$TMP/bin:$PATH" done ''; + src = fetchurl { url = ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.01.tar.bz2; md5 = "d44a81460e97ae02931c31188fe8d3fd"; }; + patches = [./cdrtools-2.01-install.patch]; meta = { |