summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-09-08 08:27:01 +0200
committermakefu <github@syntax-fehler.de>2016-09-08 08:27:01 +0200
commit1daec454eb524925eebf407c54a0e9d925b2bb7a (patch)
treea127d7af18e952bfd5ba512f62b91df1f0e3935d /makefu
parent71b41a206e22b8cf07e219028b4f365db2f765f0 (diff)
m 5 default: use cups from nixpkgs-stable
Diffstat (limited to 'makefu')
-rw-r--r--makefu/5pkgs/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 0d375a510..6d020406d 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -2,9 +2,16 @@
let
inherit (pkgs) callPackage;
+ nixpkgs-1509 = import (pkgs.fetchFromGitHub {
+ owner = "NixOS"; repo = "nixpkgs-channels";
+ rev = "91371c2bb6e20fc0df7a812332d99c38b21a2bda";
+ sha256 = "1as1i0j9d2n3iap9b471y4x01561r2s3vmjc5281qinirlr4al73";
+ }) {};
+
in
{
nixpkgs.config.packageOverrides = rec {
+ cups = nixpkgs-1509.cups;
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
alsa-hdspmixer = callPackage ./alsa-tools { alsaToolTarget="hdspmixer";};
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};