diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2005-08-01 09:31:28 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2005-08-01 09:31:28 +0000 |
| commit | 4d4425467e7d22fd12e04a45b4e152d6e26dd634 (patch) | |
| tree | 6a0e2e816d81f595e5812d354bedb5a3e5aff382 /pkgs/tools | |
| parent | 73cb069dd83808166fe063cf28d043fed351385b (diff) | |
| download | nixlib-4d4425467e7d22fd12e04a45b4e152d6e26dd634.tar nixlib-4d4425467e7d22fd12e04a45b4e152d6e26dd634.tar.gz nixlib-4d4425467e7d22fd12e04a45b4e152d6e26dd634.tar.bz2 nixlib-4d4425467e7d22fd12e04a45b4e152d6e26dd634.tar.lz nixlib-4d4425467e7d22fd12e04a45b4e152d6e26dd634.tar.xz nixlib-4d4425467e7d22fd12e04a45b4e152d6e26dd634.tar.zst nixlib-4d4425467e7d22fd12e04a45b4e152d6e26dd634.zip | |
add a patch which removes a trailing comma in an enum in a header file. qtparted and other C++ programs don't like this...
svn path=/nixpkgs/trunk/; revision=3494
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/parted/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/misc/parted/parted-trailingcomma.patch | 21 |
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 81c23cd7a24a..3db2517be77d 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -7,4 +7,5 @@ stdenv.mkDerivation { md5 = "7e46a32def60ea355c193d9225691742"; }; buildInputs = [e2fsprogs ncurses readline]; + patches = [./parted-trailingcomma.patch]; } diff --git a/pkgs/tools/misc/parted/parted-trailingcomma.patch b/pkgs/tools/misc/parted/parted-trailingcomma.patch new file mode 100644 index 000000000000..9016eb81fc9e --- /dev/null +++ b/pkgs/tools/misc/parted/parted-trailingcomma.patch @@ -0,0 +1,21 @@ +diff -ruN parted-1.6.23/include/parted/exception.h parted-1.6.23.new/include/parted/exception.h +--- parted-1.6.23/include/parted/exception.h 2001-12-27 01:26:09.000000000 +0100 ++++ parted-1.6.23.new/include/parted/exception.h 2005-08-01 11:28:38.000000000 +0200 +@@ -28,7 +28,7 @@ + PED_EXCEPTION_ERROR=3, + PED_EXCEPTION_FATAL=4, + PED_EXCEPTION_BUG=5, +- PED_EXCEPTION_NO_FEATURE=6, ++ PED_EXCEPTION_NO_FEATURE=6 + }; + typedef enum _PedExceptionType PedExceptionType; + +@@ -40,7 +40,7 @@ + PED_EXCEPTION_OK=8, + PED_EXCEPTION_RETRY=16, + PED_EXCEPTION_IGNORE=32, +- PED_EXCEPTION_CANCEL=64, ++ PED_EXCEPTION_CANCEL=64 + }; + typedef enum _PedExceptionOption PedExceptionOption; + #define PED_EXCEPTION_OK_CANCEL (PED_EXCEPTION_OK + PED_EXCEPTION_CANCEL) |