diff options
author | tv <tv@krebsco.de> | 2016-10-20 20:22:29 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2016-10-20 20:22:29 +0200 |
commit | 9329c1e47ddda0653d7e9824a01632ce3766e8f0 (patch) | |
tree | 2bfb70737a757d0bd61ca0aa895c77d740b21e73 /makefu/5pkgs/default.nix | |
parent | 844d347ce7cf0b7646e9ecba3fbdc0b90e608501 (diff) | |
parent | 0f2a9778315c3126794c0f1ad63710d38e7a67f7 (diff) |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/5pkgs/default.nix')
-rw-r--r-- | makefu/5pkgs/default.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index 6d020406d..0d375a510 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -2,16 +2,9 @@ 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";}; |