summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrancesco Gazzetta <fgaz@users.noreply.github.com>2018-02-24 22:46:29 +0100
committermujx <mujx@users.noreply.github.com>2018-02-24 23:46:29 +0200
commitea268d97610fb4f375a4be2e5f8a709740ac9ef9 (patch)
tree33f0be422b9540425e8d825c3327e34a5aed8854
parentReplace login request with the one from matrix-structs (diff)
downloadnheko-ea268d97610fb4f375a4be2e5f8a709740ac9ef9.tar.xz
Fix & cleanup nix files (#240)
* Fix default.nix

* Cleanup package.nix
-rw-r--r--default.nix2
-rw-r--r--package.nix7
2 files changed, 3 insertions, 6 deletions
diff --git a/default.nix b/default.nix

index b7cfec18..ccfb2578 100644 --- a/default.nix +++ b/default.nix
@@ -1,3 +1,3 @@ with import <nixpkgs> {}; -qt59.callPackage ./package.nix {} +libsForQt5.callPackage ./package.nix {} diff --git a/package.nix b/package.nix
index 87c4be05..e5e04543 100644 --- a/package.nix +++ b/package.nix
@@ -1,4 +1,4 @@ -{ pkgs, stdenv, qtbase, qttranslations, qtmultimedia, lmdb, mkDerivation, cmake }: +{ stdenv, qtbase, qttranslations, qtmultimedia, lmdb, cmake }: stdenv.mkDerivation rec { version = "0.1.0"; name = "nheko-${version}"; @@ -10,9 +10,6 @@ stdenv.mkDerivation rec { ./.; nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase qttranslations qtmultimedia lmdb ]; - installPhase = '' - mkdir -p $out/bin - cp nheko $out/bin/nheko - ''; + installPhase = "install -Dm755 nheko $out/bin/nheko"; }