diff options
author | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-05-02 22:58:02 +0000 |
commit | c92bca56f8ea5623cf01952621455db308d0f330 (patch) | |
tree | f940e6e4fabd8e58b91fe885f9541205258023b2 /pkgs/applications/misc/vym | |
parent | 0fdde5efd08c036fe9d73b4e65f2ba9797053d0f (diff) | |
parent | 94520a25adc6b6bee799ec9dab344cfdad3f7180 (diff) | |
download | nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.gz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.bz2 nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.lz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.xz nixlib-c92bca56f8ea5623cf01952621455db308d0f330.tar.zst nixlib-c92bca56f8ea5623cf01952621455db308d0f330.zip |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/misc/vym')
-rw-r--r-- | pkgs/applications/misc/vym/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index e595d771ec0c..8e1514583a25 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, qt4 }: +{ stdenv, fetchurl, pkgconfig, qt4, qmake4Hook }: stdenv.mkDerivation rec { name = "vym-${version}"; @@ -9,13 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1x4qp6wpszscbbs4czkfvskm7qjglvxm813nqv281bpy4y1hhvgs"; }; - buildInputs = [ pkgconfig qt4 ]; - hardeningDisable = [ "format" ]; - configurePhase = '' - qmake PREFIX="$out" - ''; + buildInputs = [ pkgconfig qt4 qmake4Hook ]; meta = with stdenv.lib; { description = "A mind-mapping software"; |