diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-13 13:57:33 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-11-13 13:57:33 +0100 |
| commit | 9073d554a55b4870315184f55c41290e430e2ee0 (patch) | |
| tree | 2db1df3bf32bb1a013080cb73a56bf9875ba8078 /pkgs/tools/package-management/checkinstall | |
| parent | 4a62542f559a8d5d3e432660b5d9071fc24a752c (diff) | |
| download | nixlib-9073d554a55b4870315184f55c41290e430e2ee0.tar nixlib-9073d554a55b4870315184f55c41290e430e2ee0.tar.gz nixlib-9073d554a55b4870315184f55c41290e430e2ee0.tar.bz2 nixlib-9073d554a55b4870315184f55c41290e430e2ee0.tar.lz nixlib-9073d554a55b4870315184f55c41290e430e2ee0.tar.xz nixlib-9073d554a55b4870315184f55c41290e430e2ee0.tar.zst nixlib-9073d554a55b4870315184f55c41290e430e2ee0.zip | |
checkinstall: Fix RPM builds
https://bugzilla.novell.com/show_bug.cgi?id=561317
Diffstat (limited to 'pkgs/tools/package-management/checkinstall')
| -rw-r--r-- | pkgs/tools/package-management/checkinstall/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/package-management/checkinstall/set-buildroot.patch | 15 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index 1320720ed170..dc3373c3b6fc 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation { # Fix a `conflicting types for 'readlink'' error since Glibc 2.19 ./readlink-types.patch + + # Fix BuildRoot handling in RPM builds. + ./set-buildroot.patch ] ++ stdenv.lib.optional (stdenv.system == "x86_64-linux") diff --git a/pkgs/tools/package-management/checkinstall/set-buildroot.patch b/pkgs/tools/package-management/checkinstall/set-buildroot.patch new file mode 100644 index 000000000000..58840f491ecf --- /dev/null +++ b/pkgs/tools/package-management/checkinstall/set-buildroot.patch @@ -0,0 +1,15 @@ +https://build.opensuse.org/package/view_file/openSUSE:13.1/checkinstall/checkinstall-set_buildroot.patch + +Index: checkinstall +=================================================================== +--- a/checkinstall 2009-12-26 20:17:24.000000000 +0100 ++++ b/checkinstall 2011-01-31 18:17:56.171593541 +0100 +@@ -2463,7 +2463,7 @@ cd "$DIRECTORIO_FUENTE" + + echo + echogn "Building RPM package..." +-$RPMBUILD -bb ${RPM_TARGET_FLAG}${ARCHITECTURE} "$SPEC_PATH" &> ${TMP_DIR}/rpmbuild.log ++$RPMBUILD --buildroot ${BUILDROOT} -bb ${RPM_TARGET_FLAG}${ARCHITECTURE} "$SPEC_PATH" &> ${TMP_DIR}/rpmbuild.log + okfail + + if [ $? -gt 0 ]; then |