Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

blender-bin: respect original nixpkgs in overlays #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions blender/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

let

pkgs = import nixpkgs {
new-pkgs = import nixpkgs {
system = "x86_64-linux";
overlays = [ self.overlays.default ];
};

mkBlender = { pname, version, src }:
mkBlender = { pkgs, pname, version, src }:
with pkgs;

stdenv.mkDerivation rec {
Expand Down Expand Up @@ -47,7 +47,7 @@
};

mkTest = { blender }:
pkgs.runCommand "blender-test" { buildInputs = [ blender ]; }
new-pkgs.runCommand "blender-test" { buildInputs = [ blender ]; }
''
blender --version
touch $out
Expand All @@ -58,6 +58,7 @@
overlays.default = final: prev: {

blender_2_79 = mkBlender {
pkgs = final;
pname = "blender-bin";
version = "2.79-20190523-054dbb833e15";
src = import <nix/fetchurl.nix> {
Expand All @@ -67,6 +68,7 @@
};

blender_2_81 = mkBlender {
pkgs = final;
pname = "blender-bin";
version = "2.81a";
src = import <nix/fetchurl.nix> {
Expand All @@ -76,6 +78,7 @@
};

blender_2_82 = mkBlender {
pkgs = final;
pname = "blender-bin";
version = "2.82a";
src = import <nix/fetchurl.nix> {
Expand All @@ -85,6 +88,7 @@
};

blender_2_83 = mkBlender {
pkgs = final;
pname = "blender-bin";
version = "2.83.9";
src = import <nix/fetchurl.nix> {
Expand All @@ -94,6 +98,7 @@
};

blender_2_90 = mkBlender {
pkgs = final;
pname = "blender-bin";
version = "2.90.1";
src = import <nix/fetchurl.nix> {
Expand All @@ -103,6 +108,7 @@
};

blender_2_91 = mkBlender {
pkgs = final;
pname = "blender-bin";
version = "2.91.2";
src = import <nix/fetchurl.nix> {
Expand All @@ -112,6 +118,7 @@
};

blender_2_92 = mkBlender {
pkgs = final;
pname = "blender-bin";
version = "2.92.0";
src = import <nix/fetchurl.nix> {
Expand All @@ -121,6 +128,7 @@
};

blender_2_93 = mkBlender {
pkgs = final;
pname = "blender-bin";
version = "2.93.7";
src = import <nix/fetchurl.nix> {
Expand All @@ -130,6 +138,7 @@
};

blender_3_0 = mkBlender {
pkgs = final;
pname = "blender-bin";
version = "3.0.1";
src = import <nix/fetchurl.nix> {
Expand All @@ -139,6 +148,7 @@
};

blender_3_1 = mkBlender {
pkgs = final;
pname = "blender-bin";
version = "3.1.2";
src = import <nix/fetchurl.nix> {
Expand All @@ -150,7 +160,7 @@
};

packages.x86_64-linux = rec {
inherit (pkgs)
inherit (new-pkgs)
blender_2_79
blender_2_81
blender_2_82
Expand Down