diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-10-31 15:16:29 +0000 |
| commit | 59b5bbeae91109007e36a269a94cccc865dc5175 (patch) | |
| tree | 1ee3d18aedace6d66034ea72fea571d20d8d0fee /pkgs/tools/networking/cmst/default.nix | |
| parent | Do not use old stdenv version in faust wrap functions. (-8 alias, -15 unpatch... (diff) | |
| parent | Merge pull request #19675 from edwtjo/dictd-touchup (diff) | |
| download | nixpkgs-gitlab.intr/security-updates.tar.gz | |
Merge branch master into security-updatesorigin/security-updatesgitlab.intr/security-updates
This merge mostly take the changes made to the master branch.
Some conflict happen in top-level/default.nix due to a reformating of the
code of which is computing the fix-point. This merge fixes these issues by
adding the pkgsIndex argument, needed to re-evaluate the fix-point with
another set of packages, and also re-add the second fix-point made to
support the dependencies.
Diffstat (limited to 'pkgs/tools/networking/cmst/default.nix')
| -rw-r--r-- | pkgs/tools/networking/cmst/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 08bdb052d639..91472b7c61e5 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cmst-${version}"; - version = "2016.04.03"; + version = "2016.10.03"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; rev = name; - sha256 = "1334ynhq1lxcfqln3bq17hy1awyfnn3zhzpsnymlyp0z3h4ydpp9"; + sha256 = "1pvk1jg0fiw0j4f1wrnhgirgziliwa44sxfdmcq9ans4zbig4izh"; }; nativeBuildInputs = [ makeWrapper qmakeHook ]; @@ -19,16 +19,14 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace ./cmst.pro \ - --replace "/usr/bin" "$out/bin" \ - --replace "/usr/share" "$out/usr/share" + --replace "/usr/share" "$out/share" substituteInPlace ./cmst.pri \ --replace "/usr/lib" "$out/lib" \ --replace "/usr/share" "$out/share" substituteInPlace ./apps/cmstapp/cmstapp.pro \ - --replace "/usr/bin" "$out/bin" \ - --replace "/usr/share" "$out/share" + --replace "/usr/bin" "$out/bin" substituteInPlace ./apps/rootapp/rootapp.pro \ --replace "/etc" "$out/etc" \ |