Unverified Commit 338a0dfe authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #229139 from bb2020/cdrdao

parents 8d5d07d3 b9ae609d

pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
Adjust some headers for glibc 2.12 compatibility.

Patch is a diff between the 1.2.3 release and CVS HEAD.



--- cdrdao-1.2.3/dao/ScsiIf-linux.cc	2009-09-28 05:42:03.000000000 -0430

+++ /home/kkallio/q/src/r/cvs/cdrdao/cdrdao/dao/ScsiIf-linux.cc	2010-08-06 07:50:46.000000000 -0430

@@ -19,6 +19,9 @@

 

 #include <config.h>

 

+#include <sys/types.h>

+#include <sys/stat.h>

+

 #include <stdio.h>

 #include <fcntl.h>

 #include <unistd.h>

pkgs/tools/cd-dvd/cdrdao/default.nix

+2 −6
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 


stdenv.mkDerivation rec {

  pname = "cdrdao";

  version = "1.2.3";

  version = "1.2.5";



  src = fetchurl {

    url = "mirror://sourceforge/cdrdao/cdrdao-${version}.tar.bz2";

    sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1";

    hash = "sha256-0ZtnyFPF26JAavqrbNeI53817r5jTKxGeVKEd8e+AbY=";

  };



  makeFlags = [ "RM=rm" "LN=ln" "MV=mv" ];
@@ -16,10 +16,6 @@ stdenv.mkDerivation rec { 


  hardeningDisable = [ "format" ];



  # Adjust some headers to match glibc 2.12 ... patch is a diff between

  # the cdrdao CVS head and the 1.2.3 release.

  patches = [ ./adjust-includes-for-glibc-212.patch ];



  # we have glibc/include/linux as a symlink to the kernel headers,

  # and the magic '..' points to kernelheaders, and not back to the glibc/include

  postPatch = ''