From ea268d97610fb4f375a4be2e5f8a709740ac9ef9 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 24 Feb 2018 22:46:29 +0100 Subject: [PATCH] Fix & cleanup nix files (#240) * Fix default.nix * Cleanup package.nix --- default.nix | 2 +- package.nix | 7 ++----- 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 {}; -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"; }