lol

Merge pull request #32789 from romildo/upd.csmt

cmst: 2017.03.18 -> 2017.09.19

authored by

Orivej Desh and committed by
GitHub
89df287f d34860b0

+8 -23
+8 -23
pkgs/tools/networking/cmst/default.nix
··· 1 - { stdenv, fetchFromGitHub, qtbase, qmake, makeWrapper, libX11 }: 1 + { stdenv, fetchFromGitHub, qmake, qtbase, libX11 }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "cmst-${version}"; 5 - version = "2017.03.18"; 5 + version = "2017.09.19"; 6 6 7 7 src = fetchFromGitHub { 8 8 repo = "cmst"; 9 9 owner = "andrew-bibb"; 10 10 rev = name; 11 - sha256 = "0lsg8ya36df48ij0jawgli3f63hy6mn9zcla48whb1l4r7cih545"; 11 + sha256 = "14inss0mr9i4q6vfqqfxbjgpjaclp1kh60qlm5xv4cwnvi395rc7"; 12 12 }; 13 13 14 - nativeBuildInputs = [ makeWrapper qmake ]; 14 + nativeBuildInputs = [ qmake ]; 15 15 16 16 buildInputs = [ qtbase ]; 17 17 18 18 enableParallelBuilding = true; 19 19 20 - preConfigure = '' 21 - substituteInPlace ./cmst.pro \ 22 - --replace "/usr/share" "$out/share" 23 - 24 - substituteInPlace ./cmst.pri \ 25 - --replace "/usr/lib" "$out/lib" \ 26 - --replace "/usr/share" "$out/share" 27 - 28 - substituteInPlace ./apps/cmstapp/cmstapp.pro \ 29 - --replace "/usr/bin" "$out/bin" 30 - 31 - substituteInPlace ./apps/rootapp/rootapp.pro \ 32 - --replace "/etc" "$out/etc" \ 33 - --replace "/usr/share" "$out/share" 34 - ''; 35 - 36 - postInstall = '' 37 - wrapProgram $out/bin/cmst \ 38 - --prefix "QTCOMPOSE" ":" "${libX11}/share/X11/locale" 20 + postPatch = '' 21 + for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do 22 + substituteInPlace $f --replace /etc $out/etc --replace /usr $out 23 + done 39 24 ''; 40 25 41 26 meta = {